diff --git a/common/modules/config.jsm b/common/modules/config.jsm
index 4883dd6e..1137e993 100644
--- a/common/modules/config.jsm
+++ b/common/modules/config.jsm
@@ -284,8 +284,9 @@ var ConfigBase = Class("ConfigBase", {
         TabClose;.tab-close-button
         TabIcon;.tab-icon       min-width: 16px;
         TabText;.tab-text
-        TabNumber               font-weight: bold; margin: 0px; padding-right: .8ex;
+        TabNumber               font-weight: bold; margin: 0px; padding-right: .8ex; cursor: default;
         TabIconNumber {
+            cursor: default;
             width: 16px;
             margin: 0 2px 0 -18px !important;
             font-weight: bold;
diff --git a/common/modules/prefs.jsm b/common/modules/prefs.jsm
index e01bfb9f..ebf69a54 100644
--- a/common/modules/prefs.jsm
+++ b/common/modules/prefs.jsm
@@ -132,7 +132,7 @@ var Prefs = Module("prefs", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
         let defval = this._load(name, null, true);
         let saved  = this._load(this.SAVED + name);
 
-        if (saved == null && curval != defval || curval != saved) {
+        if (saved == null && curval != defval || saved != null && curval != saved) {
             let msg = "Warning: setting preference " + name + ", but it's changed from its default value.";
             if (message)
                 msg = template.linkifyHelp(msg + " " + message);
diff --git a/common/modules/storage.jsm b/common/modules/storage.jsm
index 6e770bfd..7748d644 100644
--- a/common/modules/storage.jsm
+++ b/common/modules/storage.jsm
@@ -115,10 +115,11 @@ var ObjectStore = Class("ObjectStore", StoreBase, {
         this.fireEvent("clear");
     },
 
-    get: function get(key, default_)
-        key in this._object  ? this._object[key] :
-        arguments.length > 1 ? this.set(key, default_) :
-                               undefined,
+    get: function get(key, default_) {
+        return key in this._object  ? this._object[key] :
+               arguments.length > 1 ? this.set(key, default_) :
+                                      undefined;
+    },
 
     keys: function keys() Object.keys(this._object),