diff --git a/common/content/buffer.js b/common/content/buffer.js
index 1d3a280e..884e2afe 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -332,6 +332,9 @@ const Buffer = Module("buffer", {
         Math.min.apply(Math,
             buffer.allFrames().map(function (frame)
                 frame.document.pageIsFullyLoaded || 0)),
+    set loaded(val)
+        buffer.allFrames().forEach(function (frame)
+            frame.document.pageIsFullyLoaded = val),
 
     /**
      * @property {Object} The local state store for the currently selected
diff --git a/common/content/mappings.js b/common/content/mappings.js
index 3b8de180..522f76bf 100644
--- a/common/content/mappings.js
+++ b/common/content/mappings.js
@@ -419,10 +419,12 @@ const Mappings = Module("mappings", {
                     completer: function (context, args) {
                         if (args.length == 1)
                             return completion.userMapping(context, args, mapmodes);
-                        if (args["-javascript"])
-                            return completion.javascript(context);
-                        if (args["-ex"])
-                            return completion.ex(context);
+                        if (args.length == 2) {
+                            if (args["-javascript"])
+                                return completion.javascript(context);
+                            if (args["-ex"])
+                                return completion.ex(context);
+                        }
                     },
                     literal: 1,
                     options: [
@@ -430,6 +432,10 @@ const Mappings = Module("mappings", {
                             names: ["-builtin", "-b"],
                             description: "Execute this mapping as if there were no user-defined mappings"
                         },
+                        {
+                            names: ["-count", "-c"],
+                            description: "Accept a count before the requisite key press"
+                        },
                         {
                             names: ["-description", "-d"],
                             description: "A description of this mapping",
diff --git a/common/locale/en-US/map.xml b/common/locale/en-US/map.xml
index 14d35358..2b02e50f 100644
--- a/common/locale/en-US/map.xml
+++ b/common/locale/en-US/map.xml
@@ -113,6 +113,7 @@
     <dt></dt> <dd></dd>
 
     <dt>-builtin</dt> <dd>Execute this mapping as if there were no user-defined mappings (short name <em>-b</em>)</dd>
+    <dt>-count</dt> <dd>Accept a count before the requisite key press (short name <em>-c</em>)</dd>
     <dt>-descripion</dt> <dd>A description of this mapping (short name <em>-d</em>)</dd>
     <dt>-ex</dt> <dd>Execute <a>rhs</a> as an Ex command rather than keys (short name <em>-e</em>)</dd>
     <dt>-javascript</dt> <dd>Execute <a>rhs</a> as JavaScript rather than keys (short names <em>-js</em>, <em>-j</em>)</dd>