diff --git a/.github/workflows/src/windows_mozconfig b/.github/workflows/src/windows_mozconfig
index f39d4d54a..317eed3a5 100644
--- a/.github/workflows/src/windows_mozconfig
+++ b/.github/workflows/src/windows_mozconfig
@@ -24,7 +24,7 @@ export WINE="$TOOLS/wine/bin/wine64"
 #export WIN32_REDIST_DIR="$TOOLS"/vs2022/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT
 #export WIN_UCRT_REDIST_DIR="$TOOLS/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
 
-export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64-v3"
+export RUSTFLAGS="$RUSTFLAGS -Ctarget-cpu=x86-64"
 
 ac_add_options --enable-default-browser-agent
 ac_add_options --enable-install-strip
diff --git a/configs/common/mozconfig b/configs/common/mozconfig
index 7b7bee118..2bd2f9e51 100644
--- a/configs/common/mozconfig
+++ b/configs/common/mozconfig
@@ -59,9 +59,11 @@ if test "$ZEN_RELEASE"; then
   ac_add_options --disable-profiling
   ac_add_options --disable-rust-tests
 
-  export MOZ_LTO=full
-  ac_add_options MOZ_LTO=full
-  ac_add_options --enable-lto=full
+  if ! test "$ZEN_CROSS_COMPILING"; then
+    export MOZ_LTO=full
+    ac_add_options MOZ_LTO=full
+    ac_add_options --enable-lto=full
+  fi
 
   mk_add_options MOZILLA_OFFICIAL=1
 
diff --git a/configs/windows/mozconfig b/configs/windows/mozconfig
index 0bafe42e9..ff21e6305 100644
--- a/configs/windows/mozconfig
+++ b/configs/windows/mozconfig
@@ -1,5 +1,4 @@
 
-ac_add_options --enable-js-shell 
 
 # Disable telemetry and tracking
 mk_add_options MOZ_TELEMETRY_REPORTING=
diff --git a/package.json b/package.json
index 17d31c1d8..e925ea711 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,6 @@
   },
   "homepage": "https://github.com/zen-browser/core#readme",
   "dependencies": {
-    "@zen-browser/surfer": "^1.0.16"
+    "@zen-browser/surfer": "^1.0.17"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4da521c10..5e2d0b236 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     dependencies:
       '@zen-browser/surfer':
-        specifier: ^1.0.16
-        version: 1.0.16
+        specifier: ^1.0.17
+        version: 1.0.17
 
 packages:
 
@@ -109,8 +109,8 @@ packages:
   '@types/node@17.0.45':
     resolution: {integrity: sha512-w+tIMs3rq2afQdsPJlODhoUEKzFP1ayaoyl1CcnwtIlsVe7K7bA1NGm4s3PraqTLlXnbIN84zuBlxBWo1u9BLw==}
 
-  '@zen-browser/surfer@1.0.16':
-    resolution: {integrity: sha512-ZwctoDRV2+F7ZwEzWXex8mOxdW0in8Tc9eiBXUhBCmPWpuL3/SX5Vzhfte7OFWrYcJ1pP3HSsny1Z5SZ9hqgrA==}
+  '@zen-browser/surfer@1.0.17':
+    resolution: {integrity: sha512-3CyJwyty4qrsxVQThNP6HFl/lglMZp6BWbkr3yYqIYvIv/rKdCRBfQ51qiUkMxDvSYtqzZfhSbIqsMul9b6+xg==}
     hasBin: true
 
   ansi-regex@5.0.1:
@@ -546,7 +546,7 @@ snapshots:
 
   '@types/node@17.0.45': {}
 
-  '@zen-browser/surfer@1.0.16':
+  '@zen-browser/surfer@1.0.17':
     dependencies:
       '@resvg/resvg-js': 1.4.0
       async-icns: 1.0.2