diff --git a/common/content/buffer.js b/common/content/buffer.js
index 58c50c30..3afb2bd7 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -671,12 +671,12 @@ var Buffer = Module("buffer", {
                                   null, null, null, persist));
 
         persist.progressListener = update(Object.create(downloadListener), {
-            onStateChange: function onStateChange(progress, request, flags, status) {
+            onStateChange: util.wrapCallback(function onStateChange(progress, request, flags, status) {
                 if (callback && (flags & Ci.nsIWebProgressListener.STATE_STOP) && status == 0)
-                    dactyl.trapErrors(callback, self, uri, file, progress, request, flag, status);
+                    dactyl.trapErrors(callback, self, uri, file, progress, request, flags, status);
 
                 return onStateChange.superapply(this, arguments);
-            }
+            })
         });
 
         persist.saveURI(uri, null, null, null, null, file);
diff --git a/common/content/events.js b/common/content/events.js
index 1e36bf7c..afeef690 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1417,7 +1417,7 @@ var Events = Module("events", {
         keyup: function onKeyUp(event) {
             if (event.type == "keydown")
                 this.keyEvents.push(event);
-            else
+            else if (!this.processor)
                 this.keyEvents = [];
 
             let pass = this.passing && !event.isMacro ||