diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
index c848860bd7b0..92c2e3c51603 100644
--- a/.github/workflows/linux_builds.yml
+++ b/.github/workflows/linux_builds.yml
@@ -37,7 +37,7 @@ jobs:
             sconsflags: float=64 use_asan=yes use_ubsan=yes
             proj-test: true
             godot-cpp-test: true
-            bin: "./bin/godot.linuxbsd.double.tools.64s"
+            bin: "./bin/godot.linuxbsd.double.tools.64.san"
             build-mono: false
             # Skip 2GiB artifact speeding up action.
             artifact: false
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index bdba5130ec16..1c1ee5cd10f7 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -4606,7 +4606,7 @@ Error GLTFDocument::_parse_lights(Ref<GLTFState> state) {
 			light->outer_cone_angle = spot["outerConeAngle"];
 			ERR_CONTINUE_MSG(light->inner_cone_angle >= light->outer_cone_angle, "The inner angle must be smaller than the outer angle.");
 		} else if (type != "point" && type != "directional") {
-			ERR_CONTINUE_MSG(ERR_PARSE_ERROR, "Light type is unknown.");
+			ERR_CONTINUE_MSG(true, "Light type is unknown.");
 		}
 
 		state->lights.push_back(light);
diff --git a/platform/android/detect.py b/platform/android/detect.py
index 6f98dab2cc62..3319d5890c85 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -152,7 +152,7 @@ def configure(env):
         abi_subpath = "i686-linux-android"
         arch_subpath = "x86"
         env["x86_libtheora_opt_gcc"] = True
-    if env["android_arch"] == "x86_64":
+    elif env["android_arch"] == "x86_64":
         if get_platform(env["ndk_platform"]) < 21:
             print(
                 "WARNING: android_arch=x86_64 is not supported by ndk_platform lower than android-21; setting"
diff --git a/platform/linuxbsd/detect.py b/platform/linuxbsd/detect.py
index 07e16a982b35..ab643b254ae1 100644
--- a/platform/linuxbsd/detect.py
+++ b/platform/linuxbsd/detect.py
@@ -161,7 +161,7 @@ def configure(env):
         env.Append(LINKFLAGS=["-ftest-coverage", "-fprofile-arcs"])
 
     if env["use_ubsan"] or env["use_asan"] or env["use_lsan"] or env["use_tsan"] or env["use_msan"]:
-        env.extra_suffix += "s"
+        env.extra_suffix += ".san"
 
         if env["use_ubsan"]:
             env.Append(
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index f5c77313950f..c67791b340fe 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -124,7 +124,7 @@ def configure(env):
         env["AS"] = basecmd + "as"
 
     if env["use_ubsan"] or env["use_asan"] or env["use_tsan"]:
-        env.extra_suffix += "s"
+        env.extra_suffix += ".san"
 
         if env["use_ubsan"]:
             env.Append(
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index aaaa50e72981..e9ecc99ef581 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -308,7 +308,7 @@ def configure_msvc(env, manual_msvc_config):
 
     # Sanitizers
     if env["use_asan"]:
-        env.extra_suffix += ".s"
+        env.extra_suffix += ".san"
         env.Append(LINKFLAGS=["/INFERASANLIBS"])
         env.Append(CCFLAGS=["/fsanitize=address"])
 
diff --git a/thirdparty/vhacd/0004-fix-uwp-arm-build.patch b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch
index a5bba3fd7da5..8a57aae7fd67 100644
--- a/thirdparty/vhacd/0004-fix-uwp-arm-build.patch
+++ b/thirdparty/vhacd/0004-fix-uwp-arm-build.patch
@@ -9,7 +9,7 @@ index 3999a71521..4c9e0cf7ab 100644
 -#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
 +// -- GODOT start --
 +//#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
-+#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM))
++#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) && (!defined(_M_ARM64))
 +// -- GODOT end --
  #define BT_USE_SSE
  #include <emmintrin.h>
diff --git a/thirdparty/vhacd/inc/btScalar.h b/thirdparty/vhacd/inc/btScalar.h
index 4c9e0cf7abb8..da2a5993cab1 100644
--- a/thirdparty/vhacd/inc/btScalar.h
+++ b/thirdparty/vhacd/inc/btScalar.h
@@ -74,7 +74,7 @@ inline int32_t btGetVersion()
 
 // -- GODOT start --
 //#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION))
-#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM))
+#if (defined(_WIN32) && (_MSC_VER) && _MSC_VER >= 1400) && (!defined(BT_USE_DOUBLE_PRECISION)) && (!defined(_M_ARM)) && (!defined(_M_ARM64))
 // -- GODOT end --
 #define BT_USE_SSE
 #include <emmintrin.h>