diff --git a/common/content/buffer.js b/common/content/buffer.js
index fd750f6e..9ddf9ba4 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -569,12 +569,9 @@ function Buffer() //{{{
                 let file = io.getFile(filename);
 
                 if (file.exists() && !args.bang)
-                {
-                    liberator.echoerr("E13: File exists (add ! to override)");
-                    return;
-                }
+                    return void liberator.echoerr("E13: File exists (add ! to override)");
 
-                chosenData = { file: file, uri: makeURI(doc.location.href, doc.characterSet) };
+                chosenData = { file: file, uri: window.makeURI(doc.location.href, doc.characterSet) };
             }
 
             // if browser.download.useDownloadDir = false then the "Save As"
diff --git a/vimperator/content/bookmarks.js b/vimperator/content/bookmarks.js
index 94e42657..bec83266 100644
--- a/vimperator/content/bookmarks.js
+++ b/vimperator/content/bookmarks.js
@@ -62,7 +62,12 @@ function Bookmarks() //{{{
     const faviconService   = Cc["@mozilla.org/browser/favicon-service;1"].getService(Ci.nsIFaviconService);
 
     // XXX for strange firefox bug :(
-    taggingService.getTagsForURI(makeURI('http://mysterious.bug'), {});
+    // Error: [Exception... "Component returned failure code: 0x8000ffff (NS_ERROR_UNEXPECTED) [nsIObserverService.addObserver]"
+    //     nsresult: "0x8000ffff (NS_ERROR_UNEXPECTED)"
+    //     location: "JS frame :: file://~firefox/components/nsTaggingService.js :: anonymous :: line 89"
+    //     data: no]                                                                                                                                                 
+    // Source file: file://~firefox/components/nsTaggingService.js 
+    taggingService.getTagsForURI(window.makeURI("http://mysterious.bug"), {});
 
     const Bookmark = new Struct("url", "title", "icon", "keyword", "tags", "id");
     const Keyword = new Struct("keyword", "title", "icon", "url");