diff --git a/.SRCINFO b/.SRCINFO
index d10b046..7fac4e9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -70,13 +70,15 @@ pkgbase = firedragon
 	source_x86_64 = remove_addons.patch
 	source_x86_64 = context-menu.patch
 	source_x86_64 = mozilla-vpn-ad.patch
+	source_x86_64 = builtin_js.patch
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = SKIP
 	sha512sums_x86_64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
-	sha512sums_x86_64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
+	sha512sums_x86_64 = 5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6
 	sha512sums_x86_64 = 43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066
+	sha512sums_x86_64 = 25c9fa51d0ebfeea9ad88c83325dae1d0643499253946278ffeaf04b7d1aad61a76e24a5b0e1689877fa6fd5ca67135006dd8edecb54418012c826f94ca22555
 	source_aarch64 = hg+https://hg.mozilla.org/mozilla-unified#revision=autoland
 	source_aarch64 = firedragon.desktop
 	source_aarch64 = git+https://gitlab.com/dr460nf1r3/common.git
@@ -86,14 +88,16 @@ pkgbase = firedragon
 	source_aarch64 = arm.patch
 	source_aarch64 = build-arm-libopus.patch
 	source_aarch64 = mozilla-vpn-ad.patch
+	source_aarch64 = builtin_js.patch
 	sha512sums_aarch64 = SKIP
 	sha512sums_aarch64 = 1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290
 	sha512sums_aarch64 = SKIP
 	sha512sums_aarch64 = SKIP
 	sha512sums_aarch64 = 861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3
-	sha512sums_aarch64 = bf0fb3102f24b534631e8b18d5df6687134276c90bb07d7eab9e032712a16382f8427768270e3b9205f42ea9ec22d9dc1e80664a77fbcbf62bb896e347e493d3
+	sha512sums_aarch64 = 5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6
 	sha512sums_aarch64 = 7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f
 	sha512sums_aarch64 = 6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35
 	sha512sums_aarch64 = 43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066
+	sha512sums_aarch64 = 25c9fa51d0ebfeea9ad88c83325dae1d0643499253946278ffeaf04b7d1aad61a76e24a5b0e1689877fa6fd5ca67135006dd8edecb54418012c826f94ca22555
 
 pkgname = firedragon
diff --git a/PKGBUILD b/PKGBUILD
index a72421d..20593cf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -41,7 +41,8 @@ source_x86_64=("hg+$_repo#revision=autoland"
                "git+https://gitlab.com/dr460nf1r3/settings.git"
                remove_addons.patch
                context-menu.patch
-               mozilla-vpn-ad.patch)
+               mozilla-vpn-ad.patch
+               builtin_js.patch)
 source_aarch64=("hg+$_repo#revision=autoland"
                 $pkgname.desktop
                 "git+https://gitlab.com/dr460nf1r3/common.git"
@@ -50,7 +51,8 @@ source_aarch64=("hg+$_repo#revision=autoland"
                 context-menu.patch
                 arm.patch
                 build-arm-libopus.patch
-                mozilla-vpn-ad.patch)
+                mozilla-vpn-ad.patch
+                builtin_js.patch)
 
 sha512sums_x86_64=('SKIP'
                    '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
@@ -58,7 +60,8 @@ sha512sums_x86_64=('SKIP'
                    'SKIP'
                    '861e692daf2be7239eb6b61435688a7abed2bef198067f5b3a9c1a44d8316d1e547c06e1bfb45be402c4c38b1bf13018ba594d433c1b70da6296bd5b90b0fbe3'
                    '5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6'
-                   '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066')
+                   '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066'
+                   '25c9fa51d0ebfeea9ad88c83325dae1d0643499253946278ffeaf04b7d1aad61a76e24a5b0e1689877fa6fd5ca67135006dd8edecb54418012c826f94ca22555')
 sha512sums_aarch64=('SKIP'
                     '1688d8696f0a4451bc1211707362ca79d302ae0e8153be8326392b5617cb3944344e9d8fe17d0b1d5fe7df6d38fd44d4d33e3eb84e7b8763c37aeab4b2c26290'
                     'SKIP'
@@ -67,7 +70,8 @@ sha512sums_aarch64=('SKIP'
                     '5f7da8d54065c009f94c60eb9aa99d4d44d75b27800bcad5e9f2a365e0c853cb234c871c54855522598b1fe26669bd42a302705ac385d536c90f4ec199cf1df6'
                     '7c2f0c792eb5744eaf0f2ee7c0887a74118796d691029e824451b063d5ba9e65626617ad343f69837297b2002446e02ac1d5ab3bc470419ae092424abf08293f'
                     '6d464cce32cb2e440fb137666aeefec1240bcbdfdef0e8633e0fbe22e2214446b2c992ee2c8716c682a42fcd1d66d9fdf1d6d5b40f8ec3b0eeec5ca9e3f1aa35'
-                    '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066')
+                    '43d008c63a6b90a3710c4e1bf6ccebcb0987316213fa993fd1bd4b47d9a5d553f51471467c9d9ab454911b9d6fb575e3035cd7a3f9e61dbb72fe3b0a3b20a066'
+                    '25c9fa51d0ebfeea9ad88c83325dae1d0643499253946278ffeaf04b7d1aad61a76e24a5b0e1689877fa6fd5ca67135006dd8edecb54418012c826f94ca22555')
 
 pkgver() {
   cd mozilla-unified
@@ -181,6 +185,9 @@ ac_add_options --enable-optimize
 END
 fi
 
+  # Fix build-time error
+  patch -p1 -i ../builtin_js.patch
+
   # Remove some pre-installed addons that might be questionable
   patch -p1 -i ../remove_addons.patch
 
diff --git a/builtin_js.patch b/builtin_js.patch
new file mode 100644
index 0000000..a984fef
--- /dev/null
+++ b/builtin_js.patch
@@ -0,0 +1,21 @@
+diff --git a/js/src/builtin/TestingFunctions.cpp b/js/src/builtin/TestingFunctions.cpp
+index 9189ceb214..eee87893e4 100644
+--- a/js/src/builtin/TestingFunctions.cpp
++++ b/js/src/builtin/TestingFunctions.cpp
+@@ -7382,16 +7382,6 @@ JS_FOR_WASM_FEATURES(WASM_FEATURE, WASM_FEATURE)
+ "helperThreadCount()",
+ "  Returns the number of helper threads available for off-thread tasks."),
+ 
+-    JS_FN_HELP("createShapeSnapshot", CreateShapeSnapshot, 1, 0,
+-"createShapeSnapshot(obj)",
+-"  Returns an object containing a shape snapshot for use with\n"
+-"  checkShapeSnapshot.\n"),
+-
+-    JS_FN_HELP("checkShapeSnapshot", CheckShapeSnapshot, 2, 0,
+-"checkShapeSnapshot(snapshot, [obj])",
+-"  Check shape invariants based on the given snapshot and optional object.\n"
+-"  If there's no object argument, the snapshot's object is used.\n"),
+-
+     JS_FN_HELP("enableShapeConsistencyChecks", EnableShapeConsistencyChecks, 0, 0,
+ "enableShapeConsistencyChecks()",
+ "  Enable some slow Shape assertions.\n"),