diff --git a/build.sh b/build.sh
index 9dd993e..5a63320 100755
--- a/build.sh
+++ b/build.sh
@@ -87,7 +87,7 @@ do_patches() {
     patch -p1 -i ../common/patches/nightly/context-menu2.patch
     echo "patch -p1 -i ../common/patches/remove_addons.patch"
     patch -p1 -i ../common/patches/remove_addons.patch
-    echo 'patch -p1 -i ../common/patches/nightly/megabar3.patch'
+    echo 'patch -p1 -i ../common/patches/nightly/megabar2.patch'
     patch -p1 -i ../common/patches/nightly/megabar3.patch	
     echo "patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch"
     patch -p1 -i ../patches/mozilla-vpn-ad-proton.patch
@@ -278,6 +278,7 @@ git_subs() {
 
 git_init() {
     echo "git_init: begin."
+    echo "srcdir = $srcdir"
     if [ ! -d $srcdir ]; then exit 1; fi
     cd $srcdir
 
@@ -551,7 +552,7 @@ Use: ./build.sh clean | all | [other stuff...]
     mach_env           - create mach build environment.
     rustup             - perform a rustup for this user.
     git_subs           - update git submodules.
-    git_init           - create .git folder in firefox-87.0 for creating patches.
+    git_init           - create .git folder in firefox-$pkgver for creating patches.
 
 # Cross-compile from linux: (in development)
 
diff --git a/common b/common
index 5bce528..bf95af6 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 5bce5285fa7046e6987ec3e5a8931ac17ca6c7c0
+Subproject commit bf95af6af7ccf96fccb58d553ff552c41558e5d3
diff --git a/settings b/settings
index 5cbb8b8..0532d6c 160000
--- a/settings
+++ b/settings
@@ -1 +1 @@
-Subproject commit 5cbb8b8b5401188f6e92f7880d33963ee0dcd8ca
+Subproject commit 0532d6cb861db42f3ccfbb3a90908e7cc9f31013