diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 5db7d45a..74ac15aa 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -838,8 +838,14 @@ var Buffer = Module("Buffer", {
         else
             persist.progressListener = downloadListener;
 
-        persist.saveURI(params.uri, null, null, null, null,
-                        file.file, privacy);
+        if (persist.saveURI.length <= 7)
+            persist.saveURI(params.uri, null, null, null, null,
+                            file.file, privacy);
+        else
+            // Let's add an extra null to the middle of the arguments
+            // list, because why not.
+            persist.saveURI(params.uri, null, null, null, null, null,
+                            file.file, privacy);
     },
 
     /**
diff --git a/common/modules/javascript.jsm b/common/modules/javascript.jsm
index 9fa80710..5bed78e7 100644
--- a/common/modules/javascript.jsm
+++ b/common/modules/javascript.jsm
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2014 Kris Maglione <maglione.k at Gmail>
+// Copyright (c) 2008-2015 Kris Maglione <maglione.k at Gmail>
 //
 // This work is licensed for reuse under an MIT license. Details are
 // given in the LICENSE.txt file included with this file.
@@ -684,6 +684,7 @@ var JavaScript = Module("javascript", {
                     return [];
                 return completer.call(obj, context, obj, args);
             };
+            func.dactylCompleter.completers = completers;
         }
         return arguments[0];
     }