diff --git a/common/content/events.js b/common/content/events.js
index 9372affc..21417394 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -426,7 +426,7 @@ var Events = Module("events", {
                     this.feedingEvent = null;
                 }
             }
-            : function (target, event, extra) target.dispatchEvent(update(event, extra || {}))),
+            : function (target, event, extra) target.dispatchEvent(event)),
 
     get defaultTarget() dactyl.focusedElement || content.document.body || document.documentElement,
 
@@ -869,7 +869,9 @@ var Events = Module("events", {
         }
 
         if (this.feedingEvent && [!(k in event) || event[k] === v for ([k, v] in Iterator(this.feedingEvent))].every(util.identity)) {
-            update(event, this.feedingEvent);
+            for (let [k, v] in Iterator(this.feedingEvent))
+                if (!(k in event))
+                    event[k] = v;
             this.feedingEvent = null;
         }
 
@@ -987,7 +989,7 @@ var Events = Module("events", {
                         res = dactyl.trapErrors(input.fallthrough, input, event);
                     }
 
-            if (!keyModes.some(function (m) m.ownsBuffer))
+            if (!processors.some(function (p) p.main.ownsBuffer))
                 statusline.updateInputBuffer(buffer);
 
             if (waiting)
diff --git a/common/content/hints.js b/common/content/hints.js
index 17e37fad..1d355f0f 100644
--- a/common/content/hints.js
+++ b/common/content/hints.js
@@ -830,7 +830,7 @@ var Hints = Module("hints", {
                 context.compare = function () 0;
                 context.completions = [[k, v.prompt] for ([k, v] in Iterator(hints._hintModes))];
             },
-            onAccept: function (arg) { arg && util.timeout(function () hints.show(arg, opts), 0); },
+            onAccept: function (arg) { arg && util.timeout(function () dactyl.trapErrors(hints.show, hints, arg, opts), 0); },
             get onCancel() this.onAccept,
             onChange: function () { modes.pop(); }
         });