diff --git a/CMakeLists.txt b/CMakeLists.txt
index c269794f2..077af75bc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -34,8 +34,10 @@ string(REPLACE ";" "${AWS_MODULE_DIR};" AWS_MODULE_PATH "${CMAKE_PREFIX_PATH}${A
 # Append that generated list to the module search path
 list(APPEND CMAKE_MODULE_PATH ${AWS_MODULE_PATH})
 
-if (NOT CMAKE_BUILD_TYPE)
-    set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+if (NOT DEFINED CMAKE_BUILD_TYPE)
+    if (NOT WIN32)
+        set(CMAKE_BUILD_TYPE "RelWithDebInfo")
+    endif()
 endif()
 
 if (BUILD_DEPS)
@@ -43,11 +45,10 @@ if (BUILD_DEPS)
 
     include(AwsFindPackage)
     set(IN_SOURCE_BUILD ON)
-    set(BUILD_TESTING_PREV BUILD_TESTING)
+    set(BUILD_TESTING_PREV ${BUILD_TESTING})
     set(BUILD_TESTING OFF)
     add_subdirectory(aws-common-runtime/aws-crt-cpp)
-
-    set(BUILD_TESTING BUILD_TESTING_PREV)
+    set(BUILD_TESTING ${BUILD_TESTING_PREV})
 else()
     include(AwsFindPackage)
     set(IN_SOURCE_BUILD OFF)
diff --git a/aws-common-runtime/aws-crt-cpp b/aws-common-runtime/aws-crt-cpp
index 1f045a195..e8f6fe4c3 160000
--- a/aws-common-runtime/aws-crt-cpp
+++ b/aws-common-runtime/aws-crt-cpp
@@ -1 +1 @@
-Subproject commit 1f045a1956c58db11db503b3ad4f00345326ba3e
+Subproject commit e8f6fe4c37ffdedb243ed9968921709016fa4b60