diff --git a/content/buffer.js b/content/buffer.js
index 0b3b43d5..548dcd37 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -1534,9 +1534,8 @@ liberator.Buffer = function () //{{{
 
             // add the frame indicator
             var doc = frames[next].document;
-            var indicator =
-                <div id="liberator-frame-indicator"/>;
-            doc.body.appendChild(liberator.util.xmlToDom(indicator));
+            var indicator = liberator.util.xmlToDom(<div id="liberator-frame-indicator"/>, doc);
+            doc.body.appendChild(indicator);
 
             // remove the frame indicator
             setTimeout(function () { doc.body.removeChild(indicator); }, 500);
diff --git a/content/completion.js b/content/completion.js
index ba109249..760a010c 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -825,7 +825,7 @@ liberator.Completion = function () //{{{
             var command = liberator.commands.get(cmd);
             if (command && command.completer)
             {
-                matches = str.match(/^:*\d*\w+!?\s+/);
+                matches = str.match(/^:*\d*\w+[\s!]\s*/);
                 exLength = matches ? matches[0].length : 0;
                 [start, completions] = command.completer.call(this, args, special);
             }