diff --git a/common/content/events.js b/common/content/events.js
index e8debadb..f3447103 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1065,7 +1065,8 @@ const Events = Module("events", {
         }
         finally {
             let motionMap = (this._input.pendingMotionMap && this._input.pendingMotionMap.names[0]) || "";
-            statusline.updateInputBuffer(motionMap + this._input.buffer);
+            if (!(modes.extended & modes.HINTS))
+                statusline.updateInputBuffer(motionMap + this._input.buffer);
         }
     },
 
diff --git a/common/content/hints.js b/common/content/hints.js
index 243efaf8..f1482ffe 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -836,7 +836,7 @@ const Hints = Module("hints", {
                     this._hintNumber = parseInt(key, 10);
                 }
                 else
-                    this._hintNumber = (this._hintNumber * 10) + parseInt(key, 10);
+                    this._hintNumber = parseInt(String(this._hintNumber) + key, 10);
 
                 this._updateStatusline();