diff --git a/content/bookmarks.js b/content/bookmarks.js
index fc7c1fd9..e8d86050 100644
--- a/content/bookmarks.js
+++ b/content/bookmarks.js
@@ -320,6 +320,8 @@ liberator.Bookmarks = function () //{{{
         // takes about 1 sec
         get: function (filter, tags, bypassCache)
         {
+            if(bypassCache) // Is this really necessary anymore?
+                cache.load();
             return liberator.completion.filterURLArray(cache.bookmarks, filter, tags);
         },
 
diff --git a/content/buffer.js b/content/buffer.js
index 96a4d3a9..67e84665 100644
--- a/content/buffer.js
+++ b/content/buffer.js
@@ -911,7 +911,7 @@ liberator.Buffer = function () //{{{
             elem.focus();
 
             var evt = doc.createEvent("MouseEvents");
-            for each (event in ["mousedown", "mouseup", "click"])
+            for ([,event] in Iterator(["mousedown", "mouseup", "click"]))
             {
                 evt.initMouseEvent(event, true, true, view, 1, offsetX, offsetY, 0, 0,
                         ctrlKey, /*altKey*/0, shiftKey, /*metaKey*/ ctrlKey, 0, null);
@@ -1493,7 +1493,7 @@ liberator.Marks = function () //{{{
         // local marks
         for (let [mark, value] in Iterator(localMarks))
         {
-            for each (val in value.filter(function (val) val.location == location))
+            for (let [,val] in Iterator(value.filter(function (val) val.location == location)))
                 lmarks.push([mark, val]);
         }
         lmarks.sort();
diff --git a/content/completion.js b/content/completion.js
index b10c2c6e..0110e20c 100644
--- a/content/completion.js
+++ b/content/completion.js
@@ -535,7 +535,7 @@ liberator.Completion = function () //{{{
             // Longest Common Subsequence
             // This shouldn't use buildLongestCommonSubstring for performance
             // reasons, so as not to cycle through the urls twice
-            for each (elem in urls)
+            for (let [,elem] in Iterator(urls))
             {
                 var url   = elem[0] || "";
                 var title = elem[1] || "";