diff --git a/application/basilisk/installer/package-manifest.in b/application/basilisk/installer/package-manifest.in
index 6f6f145b76..0ffb701e52 100644
--- a/application/basilisk/installer/package-manifest.in
+++ b/application/basilisk/installer/package-manifest.in
@@ -73,8 +73,9 @@
 #ifdef GKMEDIAS_SHARED_LIBRARY
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
-; Hunspell
+#ifndef MOZ_SYSTEM_HUNSPELL
 @BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@
+#endif
 #ifndef MOZ_SYSTEM_NSPR
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@
diff --git a/application/palemoon/base/content/browser-appmenu.inc b/application/palemoon/base/content/browser-appmenu.inc
index 17d1030498..07115b7bff 100644
--- a/application/palemoon/base/content/browser-appmenu.inc
+++ b/application/palemoon/base/content/browser-appmenu.inc
@@ -306,8 +306,7 @@
       <menuitem id="appmenu_permissions"
                 class="menuitem-iconic"
                 label="&permissions.label;"
-                command="Tools:Permissions"
-                key="key_openPermissions"/>
+                command="Tools:Permissions"/>
 #ifdef MOZ_SERVICES_SYNC
       <!-- only one of sync-setup or sync-syncnow will be showing at once -->
       <menuitem id="sync-setup-appmenu"
diff --git a/application/palemoon/base/content/browser-places.js b/application/palemoon/base/content/browser-places.js
index 7130f7f28a..4283ad25c2 100644
--- a/application/palemoon/base/content/browser-places.js
+++ b/application/palemoon/base/content/browser-places.js
@@ -428,7 +428,7 @@ var PlacesCommandHook = {
    */
   updateBookmarkAllTabsCommand: function() {
     // There's nothing to do in non-browser windows.
-    if (window.location.href != getBrowserURL()) {
+    if (!window.location || window.location.href != getBrowserURL()) {
       return;
     }
 
diff --git a/application/palemoon/base/content/tabbrowser.xml b/application/palemoon/base/content/tabbrowser.xml
index 29c80e6a7f..e630206dc8 100644
--- a/application/palemoon/base/content/tabbrowser.xml
+++ b/application/palemoon/base/content/tabbrowser.xml
@@ -1978,7 +1978,9 @@
             setTimeout(function (tab, tabbrowser) {
               if (tab.parentNode &&
                   window.getComputedStyle(tab).maxWidth == "0.1px") {
-                NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)");
+                if (this.visible) {
+                  NS_ASSERT(false, "Giving up waiting for the tab closing animation to finish (bug 608589)");
+                }
                 tabbrowser._endRemoveTab(tab);
               }
             }, 3000, aTab, this);
diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in
index 924f37b303..93724261bf 100644
--- a/application/palemoon/installer/package-manifest.in
+++ b/application/palemoon/installer/package-manifest.in
@@ -66,8 +66,9 @@
 #ifdef GKMEDIAS_SHARED_LIBRARY
 @BINPATH@/@DLL_PREFIX@gkmedias@DLL_SUFFIX@
 #endif
-; Hunspell
+#ifndef MOZ_SYSTEM_HUNSPELL
 @BINPATH@/@DLL_PREFIX@hunspell@DLL_SUFFIX@
+#endif
 #ifndef MOZ_SYSTEM_NSPR
 #ifndef MOZ_FOLD_LIBS
 @BINPATH@/@DLL_PREFIX@nspr4@DLL_SUFFIX@