diff --git a/common/content/liberator.js b/common/content/liberator.js
index 87449c55..8a99e868 100644
--- a/common/content/liberator.js
+++ b/common/content/liberator.js
@@ -28,7 +28,7 @@ the terms of any one of the MPL, the GPL or the LGPL.
 
 /** @scope modules */
 
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm", modules);
 
 const plugins = {};
 plugins.__proto__ = modules;
diff --git a/common/content/ui.js b/common/content/ui.js
index 870b16e9..2af42f63 100644
--- a/common/content/ui.js
+++ b/common/content/ui.js
@@ -1797,7 +1797,7 @@ function ItemList(id) //{{{
         function getRows(context)
         {
             function fix(n) Math.max(0, Math.min(len, n));
-            end -= context.message + context.incomplete;
+            end -= !!context.message + context.incomplete;
             let len = context.items.length;
             let start = off;
             off += len;
diff --git a/common/content/util.js b/common/content/util.js
index 2a8d822d..93129683 100644
--- a/common/content/util.js
+++ b/common/content/util.js
@@ -687,9 +687,6 @@ const util = { //{{{
     }
 }; //}}}
 
-// Struct is really slow, AT LEAST 5 times slower than using structs or simple Objects
-// main reason is the function ConStructor(), which i couldn't get faster.
-// Maybe it's a TraceMonkey problem, for now don't use it for anything which must be fast (like bookmarks or history)
 function Struct()
 {
     let self = this instanceof Struct ? this : new Struct();