diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index a4965af6f..94c2444c1 100644
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -26,8 +26,13 @@ else()
    if (OQS_DIST_X86_64_BUILD OR OQS_USE_AES_INSTRUCTIONS)
       set(AES_IMPL ${AES_IMPL} aes/aes128_ni.c)
       set(AES_IMPL ${AES_IMPL} aes/aes256_ni.c)
-      set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
-      set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
+      if(CMAKE_C_COMPILER_ID STREQUAL "MSVC")
+        set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "")
+        set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "")
+      else()
+        set_source_files_properties(aes/aes128_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
+        set_source_files_properties(aes/aes256_ni.c PROPERTIES COMPILE_FLAGS "-maes -mssse3")
+      endif()
    elseif (OQS_DIST_ARM64_V8_BUILD)
       set(AES_IMPL ${AES_IMPL} aes/aes128_armv8.c)
       set(AES_IMPL ${AES_IMPL} aes/aes256_armv8.c)
diff --git a/tests/test_sig.c b/tests/test_sig.c
index 80fa3f5e5..d94a4db15 100644
--- a/tests/test_sig.c
+++ b/tests/test_sig.c
@@ -49,7 +49,7 @@ static OQS_STATUS sig_test_correctness(const char *method_name, bool bitflips_al
 		if (bitflips_all[i]) {
 			snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all");
 		} else {
-			snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%ld random", bitflips[i]);
+			snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%zu random", bitflips[i]);
 		}
 	}
 
diff --git a/tests/test_sig_stfl.c b/tests/test_sig_stfl.c
index 5d4d6dbe7..8f33573f5 100644
--- a/tests/test_sig_stfl.c
+++ b/tests/test_sig_stfl.c
@@ -436,7 +436,7 @@ static OQS_STATUS sig_stfl_test_correctness(const char *method_name, const char
 		if (bitflips_all[i]) {
 			snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "all");
 		} else {
-			snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%ld random", bitflips[i]);
+			snprintf(bitflips_as_str[i], sizeof(bitflips_as_str[i]), "%zu random", bitflips[i]);
 		}
 	}