diff --git a/Engine/source/math/public/math_backend.cpp b/Engine/source/math/public/math_backend.cpp
index 7998924ee..e7c6845c7 100644
--- a/Engine/source/math/public/math_backend.cpp
+++ b/Engine/source/math/public/math_backend.cpp
@@ -12,7 +12,7 @@ math_backend::backend math_backend::choose_backend(U32 cpu_flags)
 
 #elif defined(__aarch64__) || defined(__ARM_NEON)
 
-   if (cpu_flags & CPU_NEON) return backend::neon;
+   if (cpu_flags & CPU_PROP_NEON) return backend::neon;
 
 #endif
    return backend::scalar;
@@ -25,6 +25,7 @@ void math_backend::install_from_cpu_flags(uint32_t cpu_flags)
 
       switch (g_backend)
       {
+#if defined(__x86_64__) || defined(_M_X64) || defined(_M_IX86)
       case backend::avx2:
          float4::dispatch::install_avx2();
          break;
@@ -40,11 +41,11 @@ void math_backend::install_from_cpu_flags(uint32_t cpu_flags)
       case backend::sse2:
          float4::dispatch::install_sse2();
          break;
-
+#elif defined(__aarch64__) || defined(__ARM_NEON)
       case backend::neon:
          float4::dispatch::install_neon();
          break;
-
+#endif
       default:
          float4::dispatch::install_scalar();
          break;