diff --git a/common/content/tabs.js b/common/content/tabs.js
index 0c6abfe1..16e5c992 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -42,7 +42,7 @@ var Tabs = Module("tabs", {
             for (let { linkedBrowser: { contentDocument } } in values(this.allTabs))
                 if (contentDocument.readyState === "complete")
                     dactyl.initDocument(contentDocument);
-        });
+        }, 1000);
     },
 
     _alternates: Class.memoize(function () [config.tabbrowser.mCurrentTab, null]),
diff --git a/common/modules/options.jsm b/common/modules/options.jsm
index 2a45f8e6..775099ba 100644
--- a/common/modules/options.jsm
+++ b/common/modules/options.jsm
@@ -752,7 +752,7 @@ var Options = Module("options", {
             services["dactyl:"].pages["options.dtd"] = function () [null,
                 util.makeDTD(
                     iter(([["option", o.name, "default"].join("."),
-                           o.type === "string" ? o.value.replace(/'/g, "''") :
+                           o.type === "string" ? o.defaultValue.replace(/'/g, "''") :
                            o.value === true    ? "on"  :
                            o.value === false   ? "off" : o.stringDefaultValue]
                           for (o in self)),