diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53b41a3..7216a02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -138,8 +138,8 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang" )
 
     set(WarningsEXE ${WarningsLib} "-Wno-c++98-compat" "-Wno-c++98-compat-pedantic" "-Wno-switch" "-Wno-switch-enum" "-Wno-language-extension-token" "-Wno-missing-prototypes")
     target_compile_options(texassemble PRIVATE ${WarningsEXE})
-    target_compile_options(texconv PRIVATE ${WarningsEXE})
-    target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion" )
+    target_compile_options(texconv PRIVATE ${WarningsEXE} "-Wno-global-constructors")
+    target_compile_options(texdiag PRIVATE ${WarningsEXE} "-Wno-double-promotion")
 endif()
 if ( CMAKE_CXX_COMPILER_ID MATCHES "MSVC" )
     target_compile_options(${PROJECT_NAME} PRIVATE /permissive- /JMC- /Zc:__cplusplus)
diff --git a/CMakeSettings.json b/CMakeSettings.json
index 323627d..593855c 100644
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@@ -59,6 +59,18 @@
       "ctestCommandArgs": "",
       "inheritEnvironments": [ "msvc_x64_x64" ],
       "variables": []
+    },
+    {
+      "name": "arm64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "buildRoot": "${projectDir}\\out\\build\\${name}",
+      "installRoot": "${projectDir}\\out\\install\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "ctestCommandArgs": "",
+      "inheritEnvironments": [ "msvc_arm64_x64" ],
+      "variables": []
     }
   ]
 }
\ No newline at end of file
diff --git a/DirectXTex/DirectXTexWIC.cpp b/DirectXTex/DirectXTexWIC.cpp
index 9b46f1b..1a51db5 100644
--- a/DirectXTex/DirectXTexWIC.cpp
+++ b/DirectXTex/DirectXTexWIC.cpp
@@ -59,7 +59,7 @@
 
 #elif (!defined(WINAPI_FAMILY) || (WINAPI_FAMILY == WINAPI_FAMILY_DESKTOP_APP)) && (_WIN32_WINNT >= _WIN32_WINNT_WIN8)
 
-#include <shlwapi.h>
+#include <Shlwapi.h>
 #pragma comment(lib,"shlwapi.lib")
 
     static inline HRESULT CreateMemoryStream(_Outptr_ IStream** stream) noexcept
diff --git a/Texconv/texconv.cpp b/Texconv/texconv.cpp
index 6bfba87..92416d4 100644
--- a/Texconv/texconv.cpp
+++ b/Texconv/texconv.cpp
@@ -1009,26 +1009,26 @@ namespace
 
     const XMMATRIX c_from709to2020 =
     {
-        XMVECTOR { 0.6274040f, 0.0690970f, 0.0163916f, 0.f },
-        XMVECTOR { 0.3292820f, 0.9195400f, 0.0880132f, 0.f },
-        XMVECTOR { 0.0433136f, 0.0113612f, 0.8955950f, 0.f },
-        XMVECTOR { 0.f,        0.f,        0.f,        1.f }
+        0.6274040f, 0.0690970f, 0.0163916f, 0.f,
+        0.3292820f, 0.9195400f, 0.0880132f, 0.f,
+        0.0433136f, 0.0113612f, 0.8955950f, 0.f,
+        0.f,        0.f,        0.f,        1.f
     };
 
     const XMMATRIX c_from2020to709 =
     {
-        XMVECTOR { 1.6604910f,  -0.1245505f, -0.0181508f, 0.f },
-        XMVECTOR { -0.5876411f,  1.1328999f, -0.1005789f, 0.f },
-        XMVECTOR { -0.0728499f, -0.0083494f,  1.1187297f, 0.f },
-        XMVECTOR { 0.f,          0.f,         0.f,        1.f }
+        1.6604910f,  -0.1245505f, -0.0181508f, 0.f,
+        -0.5876411f,  1.1328999f, -0.1005789f, 0.f,
+        -0.0728499f, -0.0083494f,  1.1187297f, 0.f,
+        0.f,          0.f,         0.f,        1.f
     };
 
     const XMMATRIX c_fromP3to2020 =
     {
-        XMVECTOR { 0.753845f, 0.0457456f, -0.00121055f, 0.f },
-        XMVECTOR { 0.198593f, 0.941777f,   0.0176041f,  0.f },
-        XMVECTOR { 0.047562f, 0.0124772f,  0.983607f,   0.f },
-        XMVECTOR { 0.f,       0.f,         0.f,         1.f }
+        0.753845f, 0.0457456f, -0.00121055f, 0.f,
+        0.198593f, 0.941777f,   0.0176041f,  0.f,
+        0.047562f, 0.0124772f,  0.983607f,   0.f,
+        0.f,       0.f,         0.f,         1.f
     };
 
     inline float LinearToST2084(float normalizedLinearValue)