diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index 4e292a10..a8895a7c 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -1737,10 +1737,8 @@ var Buffer = Module("Buffer", {
         let timers = new WeakMap;
 
         return function smoothScrollTo(node, x, y) {
-            let { options } = overlay.activeModules;
-
-            let time = options["scrolltime"];
-            let steps = options["scrollsteps"];
+            let time = overlay.activeModules["scrolltime"];
+            let steps = overlay.activeModules["scrollsteps"];
 
             let elem = Buffer.Scrollable(node);
 
@@ -2420,7 +2418,13 @@ var Buffer = Module("Buffer", {
 
                     let elements = Array.from(frames)
                                         .flatMap(win => DOM.XPath(xpath, win.document))
-                                        .filter(elem => {
+                                        .flatMap(elems => {
+                                            var _tmp=[];
+                                            for(var i=0; i<elems.snapshotLength; i++) {
+                                                _tmp.push(elems.snapshotItem(i));
+                                            }
+                                            return _tmp;
+                                        }).filter(elem => {
 
                         if (isinstance(elem, [Ci.nsIDOMHTMLFrameElement,
                                               Ci.nsIDOMHTMLIFrameElement]))
@@ -2428,7 +2432,7 @@ var Buffer = Module("Buffer", {
 
                         elem = DOM(elem);
 
-                        if (elem[0].readOnly || elem[0].disabled || !DOM(elem).isEditable)
+                        if (!elem || !elem.length || elem[0].readOnly || elem[0].disabled || !DOM(elem).isEditable)
                             return false;
 
                         let style = elem.style;
diff --git a/common/modules/commands.jsm b/common/modules/commands.jsm
index 2d0ed3c3..3f8572b5 100644
--- a/common/modules/commands.jsm
+++ b/common/modules/commands.jsm
@@ -627,7 +627,7 @@ var CommandHive = Class("CommandHive", Contexts.Hive, {
         extra.hive = this;
         extra.parsedSpecs = Command.parseSpecs(specs);
 
-        let names = extra.parsedSpecs.flatMap();
+        let names = extra.parsedSpecs;
         let name = names[0];
 
         if (this.name != "builtin") {
diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf
index 5dc8d3a9..5d1a9015 100644
--- a/pentadactyl/install.rdf
+++ b/pentadactyl/install.rdf
@@ -5,7 +5,7 @@
         em:id="pentadactyl@addons.palemoon.org"
         em:type="2"
         em:name="Pentadactyl"
-        em:version="1.2pre-pm-3"
+        em:version="1.2pre-pm-4"
         em:description="Pale Moon for Vim and Links addicts"
         em:homepageURL="http://5digits.org/pentadactyl"
         em:bootstrap="true"