diff --git a/elisp/jabber-muc-nick-completion.el b/elisp/jabber-muc-nick-completion.el
index 29f826d..0ab9767 100644
--- a/elisp/jabber-muc-nick-completion.el
+++ b/elisp/jabber-muc-nick-completion.el
@@ -124,7 +124,7 @@ Optional argument GROUP to look."
 (defun jabber-muc-beginning-of-line ()
   "Return position of line begining."
   (save-excursion
-    (if (looking-back jabber-muc-completion-delimiter)
+    (if (looking-back jabber-muc-completion-delimiter (line-beginning-position))
         (backward-char (+ (length jabber-muc-completion-delimiter) 1)))
     (skip-syntax-backward "^-")
     (point)))
@@ -172,8 +172,9 @@ OLD is last tried nickname."
           (jabber-muc-completion-delete-last-tried)
           (progn
             (insert subst)
-            (if (looking-back (concat "^" (regexp-quote (car he-expand-list))))
-                (unless (looking-back (concat "^" (regexp-quote (car he-expand-list)) jabber-muc-completion-delimiter))
+            (if (looking-back (concat "^" (regexp-quote (car he-expand-list))) nil)
+                (unless (looking-back (concat "^" (regexp-quote (car he-expand-list)) jabber-muc-completion-delimiter)
+                                      nil)
                   (insert jabber-muc-completion-delimiter))))))
       (setq he-tried-table (cons (car he-expand-list) (cdr he-tried-table)))
       (setq he-expand-list (cdr he-expand-list))
diff --git a/elisp/jabber-presence.el b/elisp/jabber-presence.el
index 104b867..cc3a5d7 100644
--- a/elisp/jabber-presence.el
+++ b/elisp/jabber-presence.el
@@ -308,7 +308,7 @@ Show status properties from highest-priority resource."
 (defun jabber-count-connected-resources (buddy)
   "Return the number of connected resources for BUDDY."
   (let ((resource-alist (get buddy 'resources))
-	(cl-count 0))
+	(count 0))
     (dolist (resource resource-alist)
       (if (plist-get (cdr resource) 'connected)
 	  (setq count (1+ count))))
diff --git a/elisp/jabber-sawfish.el b/elisp/jabber-sawfish.el
index feb704e..749f853 100644
--- a/elisp/jabber-sawfish.el
+++ b/elisp/jabber-sawfish.el
@@ -30,8 +30,9 @@ Sawfish window manager."
   "Displays MESSAGE through the Sawfish window manager."
   (let ((process-connection-type nil))
     (start-process-shell-command
-     "jabber-sawfish" nil "echo"
-     (concat "'(progn (require (quote timers)) (display-message \""
+     "jabber-sawfish" nil
+     (concat "echo "
+             "'(progn (require (quote timers)) (display-message \""
 	     (or title text)
 	     "\")(make-timer (lambda () (display-message nil)) "
 	     (number-to-string jabber-sawfish-display-time)
diff --git a/elisp/jabber-tmux.el b/elisp/jabber-tmux.el
index 8ce2f78..1421491 100644
--- a/elisp/jabber-tmux.el
+++ b/elisp/jabber-tmux.el
@@ -20,9 +20,9 @@
 
 (eval-when-compile (require 'jabber-alert))
 
-(defun jabber-tmux-message (msg)
+(defun jabber-tmux-message (text &optional title)
   "Show MSG in tmux"
-  (call-process "tmux" nil nil nil "display-message" msg))
+  (call-process "tmux" nil nil nil "display-message" (or title text)))
 
 ; Automatically defines jabber-{message,muc,presence,info}-tmux
 ; functions.
diff --git a/elisp/jabber-widget.el b/elisp/jabber-widget.el
index 5ff9da3..3fe7c85 100644
--- a/elisp/jabber-widget.el
+++ b/elisp/jabber-widget.el
@@ -74,8 +74,7 @@ One of:
 	  (t
 	   (message "Making completion list...")
 	   (with-output-to-temp-buffer "*Completions*"
-	     (display-completion-list (all-completions prefix list nil)
-				      prefix))
+	     (display-completion-list (all-completions prefix list nil)))
 	   (message "Making completion list...done")))))
 
 (defun jabber-init-widget-buffer (submit-to)