diff --git a/CMakeLists.txt b/CMakeLists.txt
index ddbdc70ad..be4946a85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,15 +14,18 @@ list( APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake )
 include( CreateLaunchers )
 include( FindPackageHandleStandardArgs )
 
-# Produce a warning if XP support will be missing.
+# Produce a warning if XP support will be missing when building a 32 bit target for MSVC.
 if( MSVC )
-	list( APPEND WINXP_TOOLSETS v140_xp v141_xp)
-	list( FIND WINXP_TOOLSETS "${CMAKE_GENERATOR_TOOLSET}" HAVE_WINXP_SUPPORT)
+	if(NOT "${CMAKE_GENERATOR}" MATCHES "(Win64|IA64)")
 
-	if( HAVE_WINXP_SUPPORT EQUAL -1 )
-		string( REPLACE ";" " or " WINXP_TOOLSETS_STR "${WINXP_TOOLSETS}" )
-		message( WARNING "This project supports Windows XP but you must set the optional toolset to ${WINXP_TOOLSETS_STR} manually to have it in your build!\n"
-			"Assign toolset's name to CMAKE_GENERATOR_TOOLSET variable or use -T <toolset> from the command prompt." )
+		list( APPEND WINXP_TOOLSETS v140_xp v141_xp)
+		list( FIND WINXP_TOOLSETS "${CMAKE_GENERATOR_TOOLSET}" HAVE_WINXP_SUPPORT)
+
+		if( HAVE_WINXP_SUPPORT EQUAL -1 )
+			string( REPLACE ";" " or " WINXP_TOOLSETS_STR "${WINXP_TOOLSETS}" )
+			message( WARNING "This project supports Windows XP but you must set the optional toolset to ${WINXP_TOOLSETS_STR} manually to have it in your build!\n"
+				"Assign toolset's name to CMAKE_GENERATOR_TOOLSET variable or use -T <toolset> from the command prompt." )
+		endif()
 	endif()
 endif()
 
diff --git a/src/win32/i_crash.cpp b/src/win32/i_crash.cpp
index 4caa954e1..ac033d921 100644
--- a/src/win32/i_crash.cpp
+++ b/src/win32/i_crash.cpp
@@ -3359,7 +3359,7 @@ namespace
 	bool __declspec(thread) DrawerExceptionSetJumpResult;
 	CONTEXT __declspec(thread) DrawerExceptionSetJumpContext;
 	PVOID __declspec(thread) DrawerExceptionHandlerHandle;
-	char __declspec(thread) *DrawerExceptionReason;
+	const char __declspec(thread) *DrawerExceptionReason;
 	bool __declspec(thread) DrawerExceptionFatal;
 
 	LONG WINAPI DrawerExceptionHandler(_EXCEPTION_POINTERS *exceptionInfo)