diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76e754e72d..6e51ca995e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -311,7 +311,9 @@ if(NOT MSVC)
 else()
 	# Disable warnings about MS-specific _s variants of libc functions
 	add_definitions(-D_CRT_SECURE_NO_WARNINGS)
-	add_definitions(-MP)
+	if (NOT CLANG)
+		add_compile_options(-MP)
+	endif()
 	set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG")
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -D_NDEBUG")
 endif()
diff --git a/Core/HLE/sceKernel.h b/Core/HLE/sceKernel.h
index 9e2a8ff3ac..c9d4e20d4c 100644
--- a/Core/HLE/sceKernel.h
+++ b/Core/HLE/sceKernel.h
@@ -25,7 +25,7 @@
 
 class PointerWrap;
 
-enum {
+enum : u32 {
 	SCE_KERNEL_ERROR_OK                               = 0,
 	SCE_KERNEL_ERROR_ALREADY                          = 0x80000020,
 	SCE_KERNEL_ERROR_BUSY                             = 0x80000021,
diff --git a/Core/HLE/sceKernelModule.cpp b/Core/HLE/sceKernelModule.cpp
index c049729246..3d096e8a43 100644
--- a/Core/HLE/sceKernelModule.cpp
+++ b/Core/HLE/sceKernelModule.cpp
@@ -72,7 +72,7 @@ enum {
 	PSP_THREAD_ATTR_USER = 0x80000000,
 };
 
-enum {
+enum : u32 {
 	// Function exports.
 	NID_MODULE_START = 0xD632ACDB,
 	NID_MODULE_STOP = 0xCEE8593C,
diff --git a/Windows/InputDevice.cpp b/Windows/InputDevice.cpp
index d800c87713..70d4a6ff48 100644
--- a/Windows/InputDevice.cpp
+++ b/Windows/InputDevice.cpp
@@ -27,7 +27,7 @@
 
 static std::atomic_flag threadRunningFlag;
 static std::thread inputThread;
-static std::atomic_bool focused = true;
+static std::atomic_bool focused = ATOMIC_VAR_INIT(true);
 
 inline static void ExecuteInputPoll() {
 	if (host && (focused.load(std::memory_order_relaxed) || !g_Config.bGamepadOnlyFocused)) {
diff --git a/Windows/aboutbox.rc b/Windows/aboutbox.rc
index 1e669a134b..43e3b72005 100644
Binary files a/Windows/aboutbox.rc and b/Windows/aboutbox.rc differ
diff --git a/Windows/version.rc b/Windows/version.rc
index dbefa2cef8..1c6d3982b1 100644
Binary files a/Windows/version.rc and b/Windows/version.rc differ