diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 16250185..1bd1d1fc 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -369,7 +369,7 @@ const Dactyl = Module("dactyl", {
             if (elem instanceof Document)
                 elem = elem.defaultView;
             if (elem instanceof Window)
-                services.focus.focusedWindow = elem;
+                services.focus.clearFocus(elem);
             else
                 services.focus.setFocus(elem, flags);
         } catch (e) {
diff --git a/common/modules/base.jsm b/common/modules/base.jsm
index 5e0a12d3..19529316 100644
--- a/common/modules/base.jsm
+++ b/common/modules/base.jsm
@@ -248,7 +248,7 @@ function deprecated(reason, fn) {
         let frame = Components.stack.caller;
         let obj = this.className || this.constructor.className;
         if (!set.add(deprecatedMethod.seen, frame.filename))
-            util.dactyl.echoerr(
+            util.dactyl(fn).echoerr(
                 util.urlPath(frame.filename || "unknown") + ":" + frame.lineNumber + ": " +
                 (obj ? obj + "." : "") + (fn.name || name) + " is deprecated: " + reason);
         return func.apply(this, arguments);