diff --git a/meta-chromium/conf/layer.conf b/meta-chromium/conf/layer.conf
index d2de2af72..1ddabff3b 100644
--- a/meta-chromium/conf/layer.conf
+++ b/meta-chromium/conf/layer.conf
@@ -9,6 +9,6 @@ BBFILE_PATTERN_chromium-browser-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_chromium-browser-layer = "7"
 
 LAYERVERSION_chromium-browser-layer = "1"
-LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar"
+LAYERSERIES_COMPAT_chromium-browser-layer = "scarthgap styhead walnascar whinlatter"
 
 LAYERDEPENDS_chromium-browser-layer = "clang-layer core openembedded-layer"
diff --git a/meta-chromium/recipes-browser/chromium/chromium.inc b/meta-chromium/recipes-browser/chromium/chromium.inc
index 4b003cd4a..33d5dc999 100644
--- a/meta-chromium/recipes-browser/chromium/chromium.inc
+++ b/meta-chromium/recipes-browser/chromium/chromium.inc
@@ -6,7 +6,7 @@ CVE_PRODUCT = "chromium:chromium google:chrome"
 SRC_URI = "https://commondatastorage.googleapis.com/chromium-browser-official/chromium-${PV}.tar.xz"
 SRC_URI[sha256sum] = "f98315eacbf3be106feca37f8243d8c4092d4fd832c918aa36dc229eb6ab39e0"
 
-S = "${WORKDIR}/chromium-${PV}"
+S = "${UNPACKDIR}/chromium-${PV}"
 
 # GCC is not tested or officially supported upstream, and supporting it here
 # requires an ever-growing amount of backports and custom patches, without any
@@ -452,3 +452,15 @@ LIC_FILES_CHKSUM = "\
     file://${S}/url/third_party/mozilla/LICENSE.txt;md5=437ced1e9b232651b0912a9594da43b2 \
     file://${S}/v8/LICENSE;md5=f38a2942edcfe4abb45e9a83a1ad2f82 \
     "
+
+unlink_gitfiles() {
+    rm -f ${S}/.git-blame-ignore-revs
+    rm -f ${S}/.gitallowed
+    rm -f ${S}/.gitattributes
+    rm -f ${S}/.gitignore
+    rm -f ${S}/.gitmodules
+}
+
+do_unpack:append() {
+    bb.build.exec_func('unlink_gitfiles', d)
+}
diff --git a/meta-chromium/recipes-browser/chromium/gn-native_132.0.6834.83.bb b/meta-chromium/recipes-browser/chromium/gn-native_132.0.6834.83.bb
index 5a3225be9..674283371 100644
--- a/meta-chromium/recipes-browser/chromium/gn-native_132.0.6834.83.bb
+++ b/meta-chromium/recipes-browser/chromium/gn-native_132.0.6834.83.bb
@@ -6,7 +6,7 @@ require chromium.inc
 
 inherit native
 
-S = "${WORKDIR}/chromium-${PV}"
+S = "${UNPACKDIR}/chromium-${PV}"
 
 # bootstrap.py --no_clean hardcodes the build location to out_bootstrap.
 # Omitting --no_clean causes the script to create a temporary directory with a
diff --git a/meta-firefox/classes/mozilla.bbclass b/meta-firefox/classes/mozilla.bbclass
index eebfc1cb6..8f012a686 100644
--- a/meta-firefox/classes/mozilla.bbclass
+++ b/meta-firefox/classes/mozilla.bbclass
@@ -41,6 +41,7 @@ mozilla_run_mach() {
 	export SHELL="/bin/sh"
 	export RUSTFLAGS="${RUSTFLAGS} -Clinker=${WORKDIR}/wrapper/target-rust-ccld --sysroot=${RECIPE_SYSROOT}"
 
+	export AS="${CC}"
 	export RUST_HOST=${RUST_HOST}
 	export RUST_TARGET=${RUST_TARGET}
 
diff --git a/meta-firefox/conf/layer.conf b/meta-firefox/conf/layer.conf
index ce4e1978d..d924041a4 100644
--- a/meta-firefox/conf/layer.conf
+++ b/meta-firefox/conf/layer.conf
@@ -115,6 +115,6 @@ BBFILE_PATTERN_firefox-browser-layer := "^${LAYERDIR}/"
 BBFILE_PRIORITY_firefox-browser-layer = "7"
 
 LAYERVERSION_firefox-browser-layer = "2"
-LAYERSERIES_COMPAT_firefox-browser-layer = "kirkstone scarthgap walnascar"
+LAYERSERIES_COMPAT_firefox-browser-layer = "kirkstone scarthgap walnascar whinlatter"
 
 LAYERDEPENDS_firefox-browser-layer = "clang-layer core openembedded-layer"
diff --git a/meta-firefox/recipes-browser/firefox/firefox.inc b/meta-firefox/recipes-browser/firefox/firefox.inc
index eb2393ead..6f13dc690 100644
--- a/meta-firefox/recipes-browser/firefox/firefox.inc
+++ b/meta-firefox/recipes-browser/firefox/firefox.inc
@@ -121,7 +121,6 @@ SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'forbid-multiple-compositors',
            ', '', d)}"
 
 TOOLCHAIN:pn-firefox = "clang"
-AS = "${CC}"
 
 DISABLE_STATIC = ""
 
diff --git a/meta-firefox/recipes-devtools/cbindgen/cbindgen_0.28.0.bb b/meta-firefox/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
index 40436ef03..f937e5b37 100644
--- a/meta-firefox/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
+++ b/meta-firefox/recipes-devtools/cbindgen/cbindgen_0.28.0.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=9741c346eef56131163e13b9db1241b3"
 
 SRC_URI += "git://github.com/mozilla/cbindgen.git;protocol=https;branch=master"
 SRCREV = "bd78bbe59b10eda6ef1255e4acda95c56c6d0279"
-S = "${WORKDIR}/git"
 
 inherit cargo pkgconfig
 
diff --git a/meta-firefox/recipes-devtools/python-zstandard/python-zstandard_0.21.0.bb b/meta-firefox/recipes-devtools/python-zstandard/python-zstandard_0.21.0.bb
index 00670beda..36dab29a6 100644
--- a/meta-firefox/recipes-devtools/python-zstandard/python-zstandard_0.21.0.bb
+++ b/meta-firefox/recipes-devtools/python-zstandard/python-zstandard_0.21.0.bb
@@ -8,7 +8,7 @@ SRC_URI = "https://files.pythonhosted.org/packages/4d/70/1f883646641d7ad39441815
 SRC_URI[md5sum] = "7baafeb332651d70881ce692edf912b3"
 SRC_URI[sha256sum] = "f08e3a10d01a247877e4cb61a82a319ea746c356a3786558bed2481e6c405546"
 
-S = "${WORKDIR}/zstandard-0.21.0"
+S = "${UNPACKDIR}/zstandard-0.21.0"
 
 RDEPENDS_${PN} = ""
 
diff --git a/meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-native_git.bb b/meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-native_git.bb
index ad83b10fe..af1b51ac1 100644
--- a/meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-native_git.bb
+++ b/meta-firefox/recipes-devtools/wasi-sdk/wasi-sdk-native_git.bb
@@ -10,7 +10,6 @@ inherit native
 
 DEPENDS = "clang-native cmake-native ninja-native"
 
-S = "${WORKDIR}/git"
 
 SRC_URI = "gitsm://github.com/WebAssembly/wasi-sdk.git;protocol=https;branch=main"
 SRC_URI += "file://0001-disable-exceptions-and-bulk-memory.patch"