diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 12c0d6dcd..5c8c8fe7e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -115,49 +115,59 @@ if( WIN32 )
 	set( FMOD_LIB_PATH_SUFFIXES PATH_SUFFIXES lib )
 	set( NASM_NAMES nasmw nasm )
 	
-	find_path( D3D_INCLUDE_DIR d3d9.h
-		PATHS ENV DXSDK_DIR
-		PATH_SUFFIXES Include )
-	if( NOT D3D_INCLUDE_DIR )
-		message( SEND_ERROR "Could not find DirectX 9 header files" )
-	else()
-		include_directories( ${D3D_INCLUDE_DIR} )
-	endif()
+	if( NOT MSVC )
+		find_path( D3D_INCLUDE_DIR d3d9.h
+			PATHS ENV DXSDK_DIR
+			PATH_SUFFIXES Include )
+		if( NOT D3D_INCLUDE_DIR )
+			message( SEND_ERROR "Could not find DirectX 9 header files" )
+		else()
+			include_directories( ${D3D_INCLUDE_DIR} )
+		endif()
 	
-	find_path( XINPUT_INCLUDE_DIR xinput.h
-		PATHS ENV DXSDK_DIR
-		PATH_SUFFIXES Include )
-	if( NOT XINPUT_INCLUDE_DIR )
-		message( WARNING "Could not find xinput.h. XInput will be disabled." )
-		add_definitions( -DNO_XINPUT )
+		find_path( XINPUT_INCLUDE_DIR xinput.h
+			PATHS ENV DXSDK_DIR
+			PATH_SUFFIXES Include )
+		if( NOT XINPUT_INCLUDE_DIR )
+			message( WARNING "Could not find xinput.h. XInput will be disabled." )
+			add_definitions( -DNO_XINPUT )
+		else()
+			include_directories( ${XINPUT_INCLUDE_DIR} )
+		endif()
+
+		find_library( DX_dxguid_LIBRARY dxguid
+			PATHS ENV DXSDK_DIR
+			PATH_SUFFIXES Lib Lib/${XBITS} )
+		find_library( DX_dinput8_LIBRARY dinput8
+			PATHS ENV DXSDK_DIR
+			PATH_SUFFIXES Lib Lib/${XBITS} )
+
+		set( DX_LIBS_FOUND YES )
+		if( NOT DX_dxguid_LIBRARY )
+			set( DX_LIBS_FOUND NO )
+		endif()
+		if( NOT DX_dinput8_LIBRARY )
+			set( DX_LIBS_FOUND NO )
+		endif()
+
+		if( NOT DX_LIBS_FOUND )
+			message( FATAL_ERROR "Could not find DirectX 9 libraries" )
+		endif()
+		
+		set( DX_LIBS
+			"${DX_dxguid_LIBRARY}"
+			"${DX_dinput8_LIBRARY}"
+		)
 	else()
-		include_directories( ${XINPUT_INCLUDE_DIR} )
+		set( DX_LIBS
+			dxguid
+			dinput8
+		)
 	endif()
 
-	find_library( DX_dxguid_LIBRARY dxguid
-		PATHS ENV DXSDK_DIR
-		PATH_SUFFIXES Lib Lib/${XBITS} )
-	find_library( DX_dinput8_LIBRARY dinput8
-		PATHS ENV DXSDK_DIR
-		PATH_SUFFIXES Lib Lib/${XBITS} )
-
-	set( DX_LIBS_FOUND YES )
-	if( NOT DX_dxguid_LIBRARY )
-		set( DX_LIBS_FOUND NO )
-	endif()
-	if( NOT DX_dinput8_LIBRARY )
-		set( DX_LIBS_FOUND NO )
-	endif()
-
-	if( NOT DX_LIBS_FOUND )
-		message( FATAL_ERROR "Could not find DirectX 9 libraries" )
-	endif()
-
-	set( ZDOOM_LIBS
+	set( ZDOOM_LIBS ${DX_LIBS}
 		wsock32
 		winmm
-		"${DX_dxguid_LIBRARY}"
-		"${DX_dinput8_LIBRARY}"
 		ole32
 		user32
 		gdi32
diff --git a/src/g_shared/sbarinfo_commands.cpp b/src/g_shared/sbarinfo_commands.cpp
index ba83ce1c6..a9fac2ee1 100644
--- a/src/g_shared/sbarinfo_commands.cpp
+++ b/src/g_shared/sbarinfo_commands.cpp
@@ -3504,12 +3504,12 @@ class CommandIfCVarInt : public SBarInfoNegatableFlowControl
 				}
 				else
 				{
-					sc.ScriptError("Type mismatch: console variable '%s' is not of type 'bool' or 'int'.", cvarname);
+					sc.ScriptError("Type mismatch: console variable '%s' is not of type 'bool' or 'int'.", cvarname.GetChars());
 				}
 			}
 			else
 			{
-				sc.ScriptError("Unknown console variable '%s'.", cvarname);
+				sc.ScriptError("Unknown console variable '%s'.", cvarname.GetChars());
 			}
 		}
 		void	Tick(const SBarInfoMainBlock *block, const DSBarInfo *statusBar, bool hudChanged)
diff --git a/src/thingdef/thingdef_codeptr.cpp b/src/thingdef/thingdef_codeptr.cpp
index 83db1fdaa..d520a0b9d 100644
--- a/src/thingdef/thingdef_codeptr.cpp
+++ b/src/thingdef/thingdef_codeptr.cpp
@@ -76,6 +76,7 @@
 #include "d_player.h"
 #include "p_maputl.h"
 #include "p_spec.h"
+#include "templates.h"
 #include "math/cmath.h"
 
 AActor *SingleActorFromTID(int tid, AActor *defactor);
@@ -4501,7 +4502,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AActor, A_JumpIfTargetInLOS)
 		else { target = viewport; viewport = self; }
 	}
 
-	fov = MIN(fov, 360.);
+	fov = MIN<DAngle>(fov, 360.);
 
 	if (fov > 0)
 	{