diff --git a/common/content/completion.js b/common/content/completion.js
index 9cd8010a..ee86368d 100644
--- a/common/content/completion.js
+++ b/common/content/completion.js
@@ -658,7 +658,11 @@ CompletionContext.prototype = {
         this.tabPressed = false;
         this.title = ["Completions"];
         this.updateAsync = false;
-        this.waitingForTab = false;
+        try
+        {
+            this.waitingForTab = false;
+        }
+        catch (e) {}
 
         this.cancelAll();
 
@@ -677,7 +681,11 @@ CompletionContext.prototype = {
         for each (let context in this.contexts)
         {
             context.hasItems = false;
-            context.incomplete = false;
+            try
+            {
+                context.incomplete = false;
+            }
+            catch (e) {}
         }
     },
 
@@ -685,8 +693,9 @@ CompletionContext.prototype = {
      * Wait for all subcontexts to complete.
      *
      * @param {boolean} interruptible When true, the call may be interrupted
-     *    via <C-c>. In this case, "Interrupted" may be thrown.
+     *    via <C-c>, in which case, "Interrupted" may be thrown.
      * @param {number} timeout The maximum time, in milliseconds, to wait.
+     *    If 0 or null, wait indefinately.
      */
     wait: function wait(interruptable, timeout)
     {
diff --git a/common/content/events.js b/common/content/events.js
index a8d6290c..622aacdb 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1695,7 +1695,7 @@ function Events() //{{{
             {
                 setTimeout(statusline.updateUrl, 100);
             },
-            setOverLink : function (link, b)
+            setOverLink: function (link, b)
             {
                 let ssli = options["showstatuslinks"];
                 if (link && ssli)
@@ -1759,11 +1759,12 @@ function Events() //{{{
 
     window.XULBrowserWindow = self.progressListener;
     window.QueryInterface(Ci.nsIInterfaceRequestor)
-        .getInterface(Ci.nsIWebNavigation)
-        .QueryInterface(Ci.nsIDocShellTreeItem).treeOwner
-        .QueryInterface(Ci.nsIInterfaceRequestor)
-        .getInterface(Ci.nsIXULWindow)
-        .XULBrowserWindow = window.XULBrowserWindow;
+          .getInterface(Ci.nsIWebNavigation)
+          .QueryInterface(Ci.nsIDocShellTreeItem)
+          .treeOwner
+          .QueryInterface(Ci.nsIInterfaceRequestor)
+          .getInterface(Ci.nsIXULWindow)
+          .XULBrowserWindow = self.progressListener;
     try
     {
         getBrowser().addProgressListener(self.progressListener, Ci.nsIWebProgress.NOTIFY_ALL);
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 8f5f6578..3d44fbcb 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -623,6 +623,7 @@ function Tabs() //{{{
                 completer: function (context)
                 {
                     context.anchored = false;
+                    context.compare = CompletionContext.Sort.unsorted;
                     context.keys = { text: function (item) item.state.entries[0].url, description: "title" };
                     context.completions = tabs.closedTabs;
                 },
diff --git a/common/content/ui.js b/common/content/ui.js
index f9b90b4f..de7052e1 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1273,20 +1273,17 @@ function CommandLine() //{{{
             }
             else if (event.type == "input")
             {
-                //liberator.dump("input: " + command);
                 this.resetCompletions();
                 liberator.triggerCallback("change", currentExtendedMode, command);
             }
             else if (event.type == "keypress")
             {
+                let key = events.toString(event);
                 if (completions)
                     completions.previewClear();
                 if (!currentExtendedMode)
                     return true;
 
-                let key = events.toString(event);
-                //liberator.log("command line handling key: " + key + "\n");
-
                 // user pressed ENTER to carry out a command
                 // user pressing ESCAPE is handled in the global onEscape
                 //   FIXME: <Esc> should trigger "cancel" event
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index f099b36e..3a9ad0ec 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -737,6 +737,7 @@ function History() //{{{
                 context.anchored = false;
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index, 0, -1))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
+                context.compare = CompletionContext.Sort.unsorted;
             },
             count: true,
             literal: 0
@@ -783,6 +784,7 @@ function History() //{{{
                 context.anchored = false;
                 context.completions = [sh.getEntryAtIndex(i, false) for (i in util.range(sh.index + 1, sh.count))];
                 context.keys = { text: function (item) item.URI.spec, description: "title" };
+                context.compare = CompletionContext.Sort.unsorted;
             },
             count: true,
             literal: 0