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/d_stats.cpp b/src/d_stats.cpp
index 8012b10ef..c4fb6d1a5 100644
--- a/src/d_stats.cpp
+++ b/src/d_stats.cpp
@@ -317,12 +317,13 @@ void D_ConfirmSendStats()
 
 	// TODO: texts
 	static const char *const MESSAGE_TEXT = "In order to decide where to focus development, the GZDoom team would like to know a little bit about the hardware it is run on.\n" \
-		"For this we would like to ask you if we may sent three bits of information to gzstats.drdteam.org.\n" \
+		"For this we would like to ask you if we may send three bits of information to gzstats.drdteam.org.\n" \
 		"The three items we would like to know about are:\n" \
 		"- Operating system\n" \
 		"- Number of processor cores\n" \
 		"- Currently used renderer\n\n" \
-		"All information sent will be anonymous. We will NOT be sending this information to any third party. It will merely be used for decisionmaking about GZDoom's future development.\n" \
+		"All information sent will be anonymous. We will NOT be sending this information to any third party.\n" \
+		"It will merely be used for decision-making about GZDoom's future development.\n" \
 		"Data will only be sent at most twice per system, once for the software renderer and once for the hardware renderer.\n" \
 		"If you are getting this notice more than once per renderer, please let us know on the forums. Thanks!\n\n" \
 		"May we send this data? If you click 'no', nothing will be sent and you will not be asked again.";
diff --git a/src/sound/timiditypp/playmidi.cpp b/src/sound/timiditypp/playmidi.cpp
index 961a7b61d..4ffa768c8 100644
--- a/src/sound/timiditypp/playmidi.cpp
+++ b/src/sound/timiditypp/playmidi.cpp
@@ -131,11 +131,11 @@ CUSTOM_CVAR(Int, timidity_chorus, 0, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 
 CUSTOM_CVAR(Bool, timidity_surround_chorus, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
 {
-	ChangeVarSync(TimidityPlus::timidity_surround_chorus, *self);
 	if (currSong != nullptr && currSong->GetDeviceType() == MDEV_TIMIDITY)
 	{
 		MIDIDeviceChanged(-1, true);
 	}
+	ChangeVarSync(TimidityPlus::timidity_surround_chorus, *self);
 }
 
 CUSTOM_CVAR(Bool, timidity_channel_pressure, false, CVAR_ARCHIVE | CVAR_GLOBALCONFIG)
diff --git a/src/sound/timiditypp/reverb.cpp b/src/sound/timiditypp/reverb.cpp
index c83e1f568..ae7401143 100644
--- a/src/sound/timiditypp/reverb.cpp
+++ b/src/sound/timiditypp/reverb.cpp
@@ -1878,6 +1878,14 @@ void Reverb::do_ch_stereo_chorus(int32_t *buf, int32_t count, InfoStereoChorus *
 		return;
 	}
 
+	if (bufL == nullptr)
+	{
+		set_delay(&(info->delayL), info->rpt0);
+		set_delay(&(info->delayR), info->rpt0);
+		bufL = info->delayL.buf;
+		bufR = info->delayR.buf;
+	}
+
 	/* LFO */
 	f0 = imuldiv24(lfobufL[imuldiv24(lfocnt, icycle)], depth);
 	spt0 = wpt0 - pdelay - (f0 >> 8);	/* integral part of delay */
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)