diff --git a/scwx-qt/scwx-qt.cmake b/scwx-qt/scwx-qt.cmake
index 99ede29f..1af0b0ae 100644
--- a/scwx-qt/scwx-qt.cmake
+++ b/scwx-qt/scwx-qt.cmake
@@ -510,11 +510,11 @@ endif()
 # Address Sanitizer options
 if (SCWX_ADDRESS_SANITIZER)
     target_compile_options(scwx-qt PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
+        $<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address /EHsc /D_DISABLE_STRING_ANNOTATION /D_DISABLE_VECTOR_ANNOTATION>
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
     )
     target_compile_options(supercell-wx PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
+        $<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address /EHsc /D_DISABLE_STRING_ANNOTATION /D_DISABLE_VECTOR_ANNOTATION>
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
     )
     target_link_options(supercell-wx PRIVATE
diff --git a/wxdata/include/scwx/awips/message.hpp b/wxdata/include/scwx/awips/message.hpp
index e3b75d0c..6a386065 100644
--- a/wxdata/include/scwx/awips/message.hpp
+++ b/wxdata/include/scwx/awips/message.hpp
@@ -7,7 +7,7 @@
 #include <map>
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/include/scwx/wsr88d/rda/level2_message.hpp b/wxdata/include/scwx/wsr88d/rda/level2_message.hpp
index 69ec42a1..5fd10ae0 100644
--- a/wxdata/include/scwx/wsr88d/rda/level2_message.hpp
+++ b/wxdata/include/scwx/wsr88d/rda/level2_message.hpp
@@ -3,7 +3,7 @@
 #include <scwx/awips/message.hpp>
 #include <scwx/wsr88d/rda/level2_message_header.hpp>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/source/scwx/awips/wmo_header.cpp b/wxdata/source/scwx/awips/wmo_header.cpp
index f75cbded..eb4501e7 100644
--- a/wxdata/source/scwx/awips/wmo_header.cpp
+++ b/wxdata/source/scwx/awips/wmo_header.cpp
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/source/scwx/util/float.cpp b/wxdata/source/scwx/util/float.cpp
index 680188f3..cee8ae66 100644
--- a/wxdata/source/scwx/util/float.cpp
+++ b/wxdata/source/scwx/util/float.cpp
@@ -3,7 +3,7 @@
 #include <cmath>
 #include <cstring>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/source/scwx/wsr88d/rda/level2_message_header.cpp b/wxdata/source/scwx/wsr88d/rda/level2_message_header.cpp
index b1309ee3..2d450bf4 100644
--- a/wxdata/source/scwx/wsr88d/rda/level2_message_header.cpp
+++ b/wxdata/source/scwx/wsr88d/rda/level2_message_header.cpp
@@ -4,7 +4,7 @@
 #include <istream>
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/source/scwx/wsr88d/rpg/ccb_header.cpp b/wxdata/source/scwx/wsr88d/rpg/ccb_header.cpp
index bfccc1cc..cc48bd0f 100644
--- a/wxdata/source/scwx/wsr88d/rpg/ccb_header.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/ccb_header.cpp
@@ -6,7 +6,7 @@
 #include <sstream>
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp b/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
index 7ad5c168..2948bdc0 100644
--- a/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
+++ b/wxdata/source/scwx/wsr88d/rpg/level3_message_header.cpp
@@ -4,7 +4,7 @@
 #include <istream>
 #include <string>
 
-#ifdef WIN32
+#ifdef _WIN32
 #   include <WinSock2.h>
 #else
 #   include <arpa/inet.h>
diff --git a/wxdata/wxdata.cmake b/wxdata/wxdata.cmake
index b70df1d8..d0170819 100644
--- a/wxdata/wxdata.cmake
+++ b/wxdata/wxdata.cmake
@@ -294,7 +294,7 @@ set_target_properties(wxdata PROPERTIES CXX_STANDARD 20
 # Address Sanitizer options
 if (SCWX_ADDRESS_SANITIZER)
     target_compile_options(wxdata PRIVATE
-        $<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address>
+        $<$<CXX_COMPILER_ID:MSVC>:/fsanitize=address /EHsc /D_DISABLE_STRING_ANNOTATION /D_DISABLE_VECTOR_ANNOTATION>
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-fsanitize=address -fsanitize-recover=address>
     )
 endif()