diff --git a/browser/components/nsBrowserGlue.js b/browser/components/nsBrowserGlue.js
index af8a33570a..a9d95bb0cf 100644
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -922,9 +922,7 @@ BrowserGlue.prototype = {
     AutoCompletePopup.init();
     DateTimePickerHelper.init();
 
-    if (typeof this._firstWindowLoaded == "function") {
-      this._firstWindowLoaded();
-    }
+    this._firstWindowLoaded();
   },
 
   /**
diff --git a/browser/components/webextensions/ext-browserAction.js b/browser/components/webextensions/ext-browserAction.js
index e370cb205a..2c82ac701a 100644
--- a/browser/components/webextensions/ext-browserAction.js
+++ b/browser/components/webextensions/ext-browserAction.js
@@ -76,12 +76,6 @@ function BrowserAction(options, extension) {
 
 BrowserAction.prototype = {
   build() {
-    let areas = {
-      navbar: CustomizableUI.AREA_NAVBAR,
-      menupanel: CustomizableUI.AREA_PANEL,
-      tabstrip: CustomizableUI.AREA_TABSTRIP,
-      personaltoolbar: CustomizableUI.AREA_BOOKMARKS,
-    };
     let widget = CustomizableUI.createWidget({
       id: this.id,
       viewId: this.viewId,
@@ -89,8 +83,7 @@ BrowserAction.prototype = {
       removable: true,
       label: this.defaults.title || this.extension.name,
       tooltiptext: this.defaults.title || "",
-      defaultArea: areas[this.extension.manifest.browser_action.default_area] ||
-                   CustomizableUI.AREA_NAVBAR,
+      defaultArea: CustomizableUI.AREA_NAVBAR,
 
       onBeforeCreated: document => {
         let view = document.createElementNS(XUL_NS, "panelview");
diff --git a/browser/components/webextensions/schemas/browser_action.json b/browser/components/webextensions/schemas/browser_action.json
index 854a3bebbf..1a7da956a1 100644
--- a/browser/components/webextensions/schemas/browser_action.json
+++ b/browser/components/webextensions/schemas/browser_action.json
@@ -31,11 +31,6 @@
               "browser_style": {
                 "type": "boolean",
                 "optional": true
-              },
-              "default_area": {
-                "type": "string",
-                "enum": ["navbar", "menupanel", "tabstrip", "personaltoolbar"],
-                "optional": true
               }
             },
             "optional": true
diff --git a/js/src/vm/StructuredClone.cpp b/js/src/vm/StructuredClone.cpp
index 6a3ca514b9..50e6162923 100644
--- a/js/src/vm/StructuredClone.cpp
+++ b/js/src/vm/StructuredClone.cpp
@@ -2323,16 +2323,11 @@ JSStructuredCloneReader::readHeader()
         return false;
     }
 
-    // Some older IndexedDB writers stored the compatibility marker in the
-    // header. Read those records as durable cross-process data.
-    if (storedScope == JS::StructuredCloneScope::DifferentProcessForIndexedDB) {
-        storedScope = JS::StructuredCloneScope::DifferentProcess;
-    }
-
     if (allowedScope == JS::StructuredCloneScope::DifferentProcessForIndexedDB) {
         // Bug 1434308 and bug 1458320 - the scopes stored in old IndexedDB
         // clones are incorrect. Treat them as if they were DifferentProcess.
         allowedScope = JS::StructuredCloneScope::DifferentProcess;
+        return true;
     }
 
     if (storedScope < allowedScope) {
diff --git a/toolkit/components/webextensions/extensions-toolkit.manifest b/toolkit/components/webextensions/extensions-toolkit.manifest
index 5a5151aea6..a86c6778a6 100644
--- a/toolkit/components/webextensions/extensions-toolkit.manifest
+++ b/toolkit/components/webextensions/extensions-toolkit.manifest
@@ -8,7 +8,6 @@ category webextension-scripts notifications chrome://extensions/content/ext-noti
 category webextension-scripts i18n chrome://extensions/content/ext-i18n.js
 category webextension-scripts idle chrome://extensions/content/ext-idle.js
 category webextension-scripts webRequest chrome://extensions/content/ext-webRequest.js
-category webextension-scripts dns chrome://extensions/content/ext-dns.js
 category webextension-scripts webNavigation chrome://extensions/content/ext-webNavigation.js
 category webextension-scripts runtime chrome://extensions/content/ext-runtime.js
 category webextension-scripts extension chrome://extensions/content/ext-extension.js
diff --git a/toolkit/content/widgets/browser.xml b/toolkit/content/widgets/browser.xml
index db9f1051f6..839b0551c7 100644
--- a/toolkit/content/widgets/browser.xml
+++ b/toolkit/content/widgets/browser.xml
@@ -457,7 +457,7 @@
 
       <property name="webProgress"
                 readonly="true"
-                onget="return this.docShell && this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebProgress);"/>
+                onget="return this.docShell.QueryInterface(Components.interfaces.nsIInterfaceRequestor).getInterface(Components.interfaces.nsIWebProgress);"/>
 
       <field name="_contentWindow">null</field>