diff --git a/common/content/statusline.js b/common/content/statusline.js
index 6c331a0c..14f9b4e3 100644
--- a/common/content/statusline.js
+++ b/common/content/statusline.js
@@ -96,7 +96,7 @@ var StatusLine = Module("statusline", {
     signals: {
         "browser.locationChange": function (webProgress, request, uri) {
             let win = webProgress.DOMWindow;
-            this.status = buffer.uri;
+            this.updateStatus();
             this.progress = uri && win && win.dactylProgress || "";
 
             // if this is not delayed we get the position of the old buffer
@@ -142,11 +142,13 @@ var StatusLine = Module("statusline", {
                 this.progress = 0;
             if (flags & Ci.nsIWebProgressListener.STATE_STOP) {
                 this.progress = "";
-                this.status = buffer.uri;
+                this.updateStatus();
             }
         },
         "browser.statusChange": function onStatusChange(webProgress, request, status, message) {
-            this.status = message || buffer.uri;
+            this.timeout(function () {
+                this.status = message || buffer.uri;
+            });
         },
     },
 
@@ -175,7 +177,7 @@ var StatusLine = Module("statusline", {
 
     // update all fields of the statusline
     update: function update() {
-        this.status = buffer.uri;
+        this.updateStatus();
         this.inputBuffer = "";
         this.progress = "";
         this.updateTabCount();
@@ -263,7 +265,11 @@ var StatusLine = Module("statusline", {
 
     },
 
-    updateStatus: function updateStatus() { this.status = buffer.uri; },
+    updateStatus: function updateStatus() {
+        this.timeout(function () {
+            this.status = buffer.uri;
+        });
+    },
 
     updateUrl: deprecated("statusline.status", function updateUrl(url) { this.status = url || buffer.uri }),
 
diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm
index 1d90c05f..c37aa104 100644
--- a/common/modules/contexts.jsm
+++ b/common/modules/contexts.jsm
@@ -215,7 +215,8 @@ var Contexts = Module("contexts", {
                         contexts.removeGroup(this.GROUP);
                 })
             });
-            // Class.replaceProperty(plugins, file.path, self);
+            if (group !== this.user)
+                Class.replaceProperty(plugins, file.path, self);
 
             // This belongs elsewhere
             if (isPlugin && args)