diff --git a/Engine/lib/CMakeLists.txt b/Engine/lib/CMakeLists.txt
index dc205e404..c7f3874e4 100644
--- a/Engine/lib/CMakeLists.txt
+++ b/Engine/lib/CMakeLists.txt
@@ -9,11 +9,9 @@ add_subdirectory(sdl ${CMAKE_BINARY_DIR}/temp/sdl2 EXCLUDE_FROM_ALL)
 add_subdirectory(zlib ${CMAKE_BINARY_DIR}/temp/zlib EXCLUDE_FROM_ALL)
 
 # Assimp depends on zlib
-set(BUILD_SHARED_LIBS off CACHE STRING "")
-set(ASSIMP_BUILD_ZLIB off CACHE STRING "")
-set(ASSIMP_HUNTER_ENABLED off CACHE STRING "")
-set(ASSIMP_IGNORE_GIT_HASH on CACHE BOOL "")
-set(ASSIMP_WARNINGS_AS_ERRORS off CACHE BOOL "")
+set(BUILD_SHARED_LIBS off CACHE BOOL "" FORCE)
+set(ASSIMP_BUILD_ZLIB off CACHE BOOL "" FORCE)
+set(ASSIMP_HUNTER_ENABLED off CACHE BOOL "" FORCE)
 add_subdirectory(assimp ${CMAKE_BINARY_DIR}/temp/assimp EXCLUDE_FROM_ALL)
 
 if (TORQUE_CPU_ARM32 OR TORQUE_CPU_ARM64)
diff --git a/Engine/source/CMakeLists.txt b/Engine/source/CMakeLists.txt
index 2232a6dcb..79a0f9dbe 100644
--- a/Engine/source/CMakeLists.txt
+++ b/Engine/source/CMakeLists.txt
@@ -416,21 +416,21 @@ if (APPLE)
 elseif (WIN32)
 	add_executable(${TORQUE_APP_NAME} WIN32 ${TORQUE_SOURCE_FILES})
     
-    set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS /MP /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /fp:precise /fp:except- /GR /Zc:wchar_t-" )
+    set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "-DUNICODE -D_UNICODE -D_CRT_SECURE_NO_WARNINGS /MP /Ob2 /Oi /Ot /Oy /GT /Zi /W4 /nologo /GF /EHsc /GS- /Gy- /Qpar- /fp:precise /fp:except- /GR /Zc:wchar_t-" )
     if( TORQUE_CPU_X32 )
        set(TORQUE_CXX_FLAGS_COMMON_DEFAULT "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} /arch:SSE2")
     endif()
     set(TORQUE_CXX_FLAGS_COMMON ${TORQUE_CXX_FLAGS_COMMON_DEFAULT} CACHE STRING "")
     mark_as_advanced(TORQUE_CXX_FLAGS_COMMON)
 	
-    set(TORQUE_CXX_FLAGS_EXECUTABLES "/wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995 " CACHE STRING "")
+    set(TORQUE_CXX_FLAGS_EXECUTABLES "/wd4018 /wd4100 /wd4121 /wd4127 /wd4130 /wd4244 /wd4245 /wd4389 /wd4511 /wd4512 /wd4800 /wd4995" CACHE STRING "")
     mark_as_advanced(TORQUE_CXX_FLAGS_EXECUTABLES)
     
     set(TORQUE_CXX_FLAGS "${TORQUE_CXX_FLAGS_COMMON_DEFAULT} ${TORQUE_CXX_FLAGS_EXECUTABLES}" CACHE STRING "")
     mark_as_advanced(TORQUE_CXX_FLAGS)
     
 	# NOTE: On Windows, /Zc:wchar_t- is necessary otherwise you get unicode errors
-	set_target_properties(${TORQUE_APP_NAME} PROPERTIES COMPILE_FLAGS ${TORQUE_CXX_FLAGS})
+	set_target_properties(${TORQUE_APP_NAME} PROPERTIES COMPILE_FLAGS "${TORQUE_CXX_FLAGS}")
 else()
 	add_executable(${TORQUE_APP_NAME} ${TORQUE_SOURCE_FILES})