diff --git a/common/content/buffer.js b/common/content/buffer.js
index a919baf1..ab728a36 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -645,7 +645,7 @@ const Buffer = Module("buffer", {
 
         prefs.withContext(function () {
             prefs.set("browser.tabs.loadInBackground", true);
-            ["mousedown", "mouseup", "click"].slice(0, util.haveGecko("2.0") ? 2 : 3)
+            ["mousedown", "mouseup", "click"].slice(0, util.haveGecko("2b") ? 2 : 3)
                 .forEach(function (event) {
                 events.dispatch(elem, events.create(doc, event, {
                     screenX: offsetX, screenY: offsetY,
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 260df666..63de20dd 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -767,21 +767,14 @@ const Dactyl = Module("dactyl", {
      * @param {number} level The logging level 0 - 15.
      */
     log: function (msg, level) {
-        let verbose = 0;
-        if (level == undefined)
-            level = 1;
+        let verbose = prefs.get("extensions.dactyl.loglevel", 0);
 
-        // options does not exist at the very beginning
-        if (modules.options)
-            verbose = prefs.get("extensions.dactyl.loglevel", 0);
+        if (!level || level <= verbose) {
+            if (isObject(msg))
+                msg = util.objectToString(msg, false);
 
-        if (level > verbose)
-            return;
-
-        if (typeof msg == "object")
-            msg = util.objectToString(msg, false);
-
-        services.get("console").logStringMessage(config.name + ": " + msg);
+            services.get("console").logStringMessage(config.name + ": " + msg);
+        }
     },
 
     /**
diff --git a/common/content/events.js b/common/content/events.js
index 73eca85b..bbd7e806 100644
--- a/common/content/events.js
+++ b/common/content/events.js
@@ -365,7 +365,7 @@ const Events = Module("events", {
      * @param {Event} event The event to dispatch.
      */
     dispatch: Class.memoize(function ()
-        util.haveGecko("2.0")
+        util.haveGecko("2b")
             ? function (target, event) // This causes a crash on Gecko<2.0, it seems.
                     target.ownerDocument.defaultView
                           .QueryInterface(Ci.nsIInterfaceRequestor).getInterface(Ci.nsIDOMWindowUtils)