diff --git a/common/content/editor.js b/common/content/editor.js
index 8ee95dc3..333e0f72 100644
--- a/common/content/editor.js
+++ b/common/content/editor.js
@@ -41,7 +41,7 @@ var Editor = Module("editor", {
     get isTextEdit() modes.getStack(1).main == modes.TEXT_EDIT,
 
     deselectText: function () {
-        if (this.selection)
+        if (this.selection && this.selection.focusNode)
             this.selection.collapse(this.selection.focusNode,
                                     this.selection.focusOffset);
     },
diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm
index 9cb254b4..b03928ca 100644
--- a/common/modules/commands.jsm
+++ b/common/modules/commands.jsm
@@ -1400,7 +1400,6 @@ var Commands = Module("commands", {
         };
 
         completion.exMacro = function exMacro(context, args, cmd) {
-            util.dump(cmd.action.macro, cmd.action);
             if (!cmd.action.macro)
                 return;
             let { macro } = cmd.action;
diff --git a/common/modules/completion.jsm b/common/modules/completion.jsm
index f890e2e3..29fab699 100644
--- a/common/modules/completion.jsm
+++ b/common/modules/completion.jsm
@@ -601,7 +601,7 @@ var CompletionContext = Class("CompletionContext", {
         }
         this.offset += count;
         if (this._filter)
-            this._filter = this._filter.substr(advance);
+            this._filter = this._filter.substr(arguments[0] || 0);
     },
 
     /**