diff --git a/content/completion.js b/content/completion.js
index 0dcc40c4..b8e0cd84 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -573,7 +573,7 @@ function Completion() //{{{
 
             // v[0] in orig and orig[v[0]] catch different cases. XPCOM
             // objects are problematic, to say the least.
-            if ([modules, plugins, userContext].some(function (o) o.isPrototypeOf(obj)))
+            if (modules.isPrototypeOf(obj))
                 compl = [v for (v in Iterator(obj))];
             else
             {
diff --git a/content/util.js b/content/util.js
index 8a0a021b..6dbc680c 100644
--- a/content/util.js
+++ b/content/util.js
@@ -350,7 +350,7 @@ const util = { //{{{
         try // window.content often does not want to be queried with "var i in object"
         {
             let hasValue = !("__iterator__" in object);
-            if (object.__proto__ == modules || object.__proto__ == plugins)
+            if (modules.isPrototypeOf(object))
             {
                 object = Iterator(object);
                 hasValue = false;
diff --git a/skin/liberator.css b/skin/liberator.css
index 66597186..c892b45e 100644
--- a/skin/liberator.css
+++ b/skin/liberator.css
@@ -65,6 +65,12 @@ the terms of any one of the MPL, the GPL or the LGPL.
     display: table-cell;
     vertical-align: middle;
 }
+
+[liberator|highlight~=CompMsg] {
+    height: 1.5em;
+    line-height: 1.5em !important;
+}
+
 .td-span {
     display: inline-block;
     overflow: visible;