diff --git a/.github/workflows/libdmdutil.yml b/.github/workflows/libdmdutil.yml
index 961e651..a7f34d5 100644
--- a/.github/workflows/libdmdutil.yml
+++ b/.github/workflows/libdmdutil.yml
@@ -63,7 +63,7 @@ jobs:
       # install dependencies
       #
       - if: (matrix.platform == 'win')
-        uses: microsoft/setup-msbuild@v2
+        uses: microsoft/setup-msbuild@v3
       - if: (matrix.platform == 'win')
         run: |
           if [[ "${{ matrix.arch }}" == "x64" ]]; then
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 80aac9e..dc1fb57 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,12 +18,7 @@ message(STATUS "POST_BUILD_COPY_EXT_LIBS: ${POST_BUILD_COPY_EXT_LIBS}")
 message(STATUS "ENABLE_SANITIZERS: ${ENABLE_SANITIZERS}")
 message(STATUS "ENABLE_VNI: ${ENABLE_VNI}")
 
-if(PLATFORM STREQUAL "macos")
-   if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address -g")
-      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=address -g")
-   endif()
-elseif(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "ios-simulator")
+if(PLATFORM STREQUAL "ios" OR PLATFORM STREQUAL "ios-simulator")
    set(CMAKE_SYSTEM_NAME iOS)
    if (PLATFORM STREQUAL "ios-simulator")
       set(CMAKE_OSX_SYSROOT iphonesimulator)
@@ -87,13 +82,9 @@ set(CMAKE_C_VISIBILITY_PRESET hidden)
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    if(ENABLE_SANITIZERS AND (PLATFORM STREQUAL "macos" OR PLATFORM STREQUAL "linux"))
-      add_compile_options(-fsanitize=address)
-      add_link_options(-fsanitize=address)
-
-      add_compile_options(-fsanitize=undefined)
-      add_link_options(-fsanitize=undefined)
-
-      add_compile_options(-fno-omit-frame-pointer)
+      set(SANITIZER_FLAGS -fsanitize=address,undefined)
+      add_compile_options(${SANITIZER_FLAGS} -fno-omit-frame-pointer -g)
+      add_link_options(${SANITIZER_FLAGS})
    endif()
 endif()
 
diff --git a/include/DMDUtil/DMDUtil.h b/include/DMDUtil/DMDUtil.h
index f3fd696..9bacaf4 100644
--- a/include/DMDUtil/DMDUtil.h
+++ b/include/DMDUtil/DMDUtil.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #define DMDUTIL_VERSION_MAJOR 0   // X Digits
-#define DMDUTIL_VERSION_MINOR 12  // Max 2 Digits
+#define DMDUTIL_VERSION_MINOR 13  // Max 2 Digits
 #define DMDUTIL_VERSION_PATCH 0   // Max 2 Digits
 
 #define _DMDUTIL_STR(x) #x