diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index 628ebdce..35e8e588 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -859,7 +859,8 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
 
                 data.push("<"); data.push(node.localName);
                 if (node instanceof HTMLHtmlElement)
-                    data.push(" xmlns=" + XHTML.uri.quote());
+                    data.push(" xmlns=" + XHTML.uri.quote(),
+                              " xmlns:dactyl=" + NS.uri.quote());
 
                 for (let { name, value } in array.iterValues(node.attributes)) {
                     if (name == "dactyl:highlight") {
@@ -880,11 +881,10 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                         chromeFiles[value] = value.replace(/.*\//, "");
                         value = value.replace(/.*\//, "");
                     }
-                    data.push(" ");
-                    data.push(name);
-                    data.push('="');
-                    data.push(<>{value}</>.toXMLString().replace(/"/g, "&quot;"));
-                    data.push('"');
+
+                    data.push(" ", name, '="',
+                              <>{value}</>.toXMLString().replace(/"/g, "&quot;"),
+                              '"');
                 }
                 if (node.localName in empty)
                     data.push(" />");
@@ -893,7 +893,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
                     if (node instanceof HTMLHeadElement)
                         data.push(<link rel="stylesheet" type="text/css" href="help.css"/>.toXMLString());
                     Array.map(node.childNodes, fix);
-                    data.push("</"); data.push(node.localName); data.push(">");
+                    data.push("</", node.localName, ">");
                 }
                 break;
             case Node.TEXT_NODE:
diff --git a/common/modules/services.jsm b/common/modules/services.jsm
index c8c9a9a1..29acc7b0 100644
--- a/common/modules/services.jsm
+++ b/common/modules/services.jsm
@@ -39,6 +39,7 @@ var Services = Module("Services", {
         this.add("extensionManager",    "@mozilla.org/extensions/manager;1",                "nsIExtensionManager");
         this.add("externalProtocol",    "@mozilla.org/uriloader/external-protocol-service;1", "nsIExternalProtocolService");
         this.add("favicon",             "@mozilla.org/browser/favicon-service;1",           "nsIFaviconService");
+        this.add("file:",               "@mozilla.org/network/protocol;1?name=file",        "nsIFileProtocolHandler");
         this.add("focus",               "@mozilla.org/focus-manager;1",                     "nsIFocusManager");
         this.add("history",             "@mozilla.org/browser/global-history;2",
                  ["nsIBrowserHistory", "nsIGlobalHistory3", "nsINavHistoryService", "nsPIPlacesDatabase"]);
@@ -67,7 +68,6 @@ var Services = Module("Services", {
 
         this.addClass("CharsetConv",  "@mozilla.org/intl/scriptableunicodeconverter", "nsIScriptableUnicodeConverter", "charset");
         this.addClass("File",         "@mozilla.org/file/local;1",                 "nsILocalFile");
-        this.addClass("file:",        "@mozilla.org/network/protocol;1?name=file", "nsIFileProtocolHandler");
         this.addClass("Find",         "@mozilla.org/embedcomp/rangefind;1",        "nsIFind");
         this.addClass("HtmlConverter","@mozilla.org/widget/htmlformatconverter;1", "nsIFormatConverter");
         this.addClass("HtmlEncoder",  "@mozilla.org/layout/htmlCopyEncoder;1",     "nsIDocumentEncoder");
diff --git a/pentadactyl/install.rdf b/pentadactyl/install.rdf
index 1932ccf4..9bdb604c 100644
--- a/pentadactyl/install.rdf
+++ b/pentadactyl/install.rdf
@@ -32,7 +32,7 @@
             <Description
                 em:id="{ec8030f7-c20a-464f-9b0e-13a3a9e97384}"
                 em:minVersion="3.5"
-                em:maxVersion="4.0.*"/>
+                em:maxVersion="4.1a1pre"/>
         </em:targetApplication>
     </Description>
 </RDF>