diff --git a/common/content/tabs.js b/common/content/tabs.js
index 5963ba63..938b1e65 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -571,8 +571,8 @@ const Tabs = Module("tabs", {
         commands.add(["tabd[o]", "bufd[o]"],
             "Execute a command in each tab",
             function (args) {
-                for (let i = 0; i < tabs.count; i++) {
-                    tabs.select(i);
+                for (let tab in values(tabs.visibleTabs)) {
+                    tabs.select(tab);
                     if (!dactyl.execute(args[0] || "", null, true))
                         break;
                 }
diff --git a/common/modules/template.jsm b/common/modules/template.jsm
index 3d330bcb..15f31b9b 100644
--- a/common/modules/template.jsm
+++ b/common/modules/template.jsm
@@ -225,7 +225,7 @@ const Template = Module("Template", {
         let url = (frame.filename || "unknown").replace(/.* -> /, "");
         function getPath(url) {
             try {
-                return util.getFile(util.newURI(url)).path;
+                return util.getFile(url).path;
             }
             catch (e) {
                 return url;
diff --git a/common/modules/util.jsm b/common/modules/util.jsm
index de12f307..7261e780 100644
--- a/common/modules/util.jsm
+++ b/common/modules/util.jsm
@@ -470,6 +470,9 @@ const Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference])
      * @param {nsIURI} uri The URI for which to find a file.
      */
     getFile: function getFile(uri) {
+        if (isString(uri))
+            uri = util.newURI(uri);
+
         if (uri instanceof Ci.nsIFileURL)
             return File(uri.QueryInterface(Ci.nsIFileURL).file);
         let channel = services.io.newChannelFromURI(uri);