diff --git a/common/modules/buffer.jsm b/common/modules/buffer.jsm
index beb8d624..4e7dfc5b 100644
--- a/common/modules/buffer.jsm
+++ b/common/modules/buffer.jsm
@@ -2236,7 +2236,7 @@ var Buffer = Module("Buffer", {
             "Patterns used to determine line numbers used by G",
             "sitemap", {
                 // Make sure to update the docs when you change this.
-                "view-source:*": '[id^=line]',
+                "view-source:*": 'body,[id^=line]',
                 "code.google.com": '#nums [id^="nums_table"] a[href^="#"]',
                 "github.com": '.line_numbers>*',
                 "mxr.mozilla.org": 'a.l',
diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm
index 39150460..04e11cda 100644
--- a/common/modules/sanitizer.jsm
+++ b/common/modules/sanitizer.jsm
@@ -22,7 +22,7 @@ lazyRequire("overlay", ["overlay"]);
 lazyRequire("storage", ["storage"]);
 lazyRequire("template", ["template"]);
 
-let tmp = {};
+let tmp = Object.create(this);
 JSMLoader.loadSubScript("chrome://browser/content/sanitize.js", tmp);
 tmp.Sanitizer.prototype.__proto__ = Class.prototype;