diff --git a/common/content/events.js b/common/content/events.js
index 0e8d253a..130b9aa1 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -1015,7 +1015,8 @@ var Events = Module("events", {
         */
 
         input: function onInput(event) {
-            delete event.originalTarget.dactylKeyPress;
+            if ("dactylKeyPress" in event.originalTarget)
+                delete event.originalTarget.dactylKeyPress;
         },
 
         // this keypress handler gets always called first, even if e.g.
diff --git a/common/content/statusline.js b/common/content/statusline.js
index da4e15b5..1fff5292 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -47,9 +47,9 @@ var StatusLine = Module("statusline", {
                 <!-- insertbefore="dactyl.statusBefore;" insertafter="dactyl.statusAfter;" -->
                 <hbox key="container" hidden="false" align="center"  flex="1">
                     <stack orient="horizontal"       align="stretch" flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
-                        <hbox                                                 highlight="CmdLine StatusCmdLine" class="dactyl-container" id="dactyl-statusline-stack">
+                        <hbox                                                 highlight="CmdLine StatusCmdLine" class="dactyl-container">
                             <label key="mode"          crop="end"                                               class="plain" collapsed="true"/>
-                            <stack                                   flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
+                            <stack  id="dactyl-statusline-stack"     flex="1" highlight="CmdLine StatusCmdLine" class="dactyl-container">
                                 <textbox key="url"     crop="end"    flex="1"                                   class="plain dactyl-status-field-url" readonly="true"/>
                                 <textbox key="message" crop="end"    flex="1" highlight="Normal StatusNormal"   class="plain"                         readonly="true"/>
                             </stack>
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 87a91e7d..b76509ed 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -867,9 +867,11 @@ var Tabs = Module("tabs", {
     },
     events: function () {
         let tabContainer = config.tabbrowser.mTabContainer;
-        ["TabMove", "TabOpen", "TabClose"].forEach(function (event) {
-            events.addSessionListener(tabContainer, event, this.closure.updateTabCount, false);
-        }, this);
+        function callback() {
+            tabs.timeout(function () { this.updateTabCount(); });
+        }
+        for (let event in values(["TabMove", "TabOpen", "TabClose"]))
+            events.addSessionListener(tabContainer, event, callback, false);
         events.addSessionListener(tabContainer, "TabSelect", this.closure._onTabSelect, false);
     },
     mappings: function () {