diff --git a/engine/common/host.c b/engine/common/host.c
index e640663ca..1e1f554f8 100644
--- a/engine/common/host.c
+++ b/engine/common/host.c
@@ -1278,6 +1278,7 @@ void EXPORT Host_Shutdown( void )
 			host.state = HOST_SHUTDOWN;
 		break;
 	default:
+#ifndef XASH_DEDICATED
 		if( !Host_IsDedicated() && !host.skip_configs )
 		{
 			// restore all latched cheat cvars
@@ -1286,6 +1287,7 @@ void EXPORT Host_Shutdown( void )
 			IN_TouchWriteConfig();
 			host.skip_configs = false;
 		}
+#endif
 		host.state = HOST_SHUTDOWN; // prepare host to normal shutdown
 	}
 
diff --git a/engine/server/sv_phys.c b/engine/server/sv_phys.c
index e912a89f2..7cfa55782 100644
--- a/engine/server/sv_phys.c
+++ b/engine/server/sv_phys.c
@@ -1842,6 +1842,7 @@ Called from renderer for debug purposes
 */
 void SV_DrawDebugTriangles( void )
 {
+#ifndef XASH_DEDICATED
 	if( Host_IsDedicated() )
 		return;
 
@@ -1865,6 +1866,7 @@ void SV_DrawDebugTriangles( void )
 		pglDepthMask( GL_TRUE );
 		pglEnable( GL_BLEND );
 	}
+#endif
 }
 
 /*
diff --git a/msvc6/build_dedicated.bat b/msvc6/build_dedicated.bat
index a626391a9..af49ce8d7 100644
--- a/msvc6/build_dedicated.bat
+++ b/msvc6/build_dedicated.bat
@@ -1,6 +1,6 @@
 rem msvc writes all objects to CWD, so we need do some renames to resolve conflicts
 move common\common.c common\host_common.c
 move common\soundlib\libmpg\common.c common\soundlib\libmpg\mpg_common.c
-cl -Dvsnprintf=_vsnprintf -o xash_dedicated.exe /DEBUG /Zi /W3 /Gm /GD /G6 /O2 /MD /O2 /DSINGLE_BINARY /DXASH_NOCONHOST /DXASH_FORCEINLINE /DXASH_FASTSTR /D_WINDLL common\*.c server\*.c client\vgui\*.c common\soundlib\*.c common\soundlib\libmpg\*.c common\imagelib\*.c common\sdl\events.c -I ../msvc6/ -I ../SDL2-2.0.4/include/ -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl -DXASH_DEDICATED -Dsnprintf=_snprintf -DDBGHELP /link /LIBPATH:..\msvc6 user32.lib shell32.lib gdi32.lib msvcrt.lib winmm.lib /nodefaultlib:"libc.lib" /subsystem:windows ../SDL2-2.0.4/lib/x86/SDL2.lib kernel32.lib winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEBUG
+cl -Dvsnprintf=_vsnprintf -o xash_dedicated.exe /DEBUG /Zi /W3 /Gm /GD /G6 /O2 /MD /O2 /DSINGLE_BINARY /DXASH_NOCONHOST /DXASH_FORCEINLINE /DXASH_FASTSTR /D_WINDLL common\*.c server\*.c common\soundlib\*.c common\soundlib\libmpg\*.c common\imagelib\*.c -I ../msvc6/ -I ../SDL2-2.0.4/include/ -Icommon -I../common -I. -I../pm_shared -Iclient -Iserver -Iclient/vgui -Icommon/sdl -DXASH_DEDICATED -Dsnprintf=_snprintf -DDBGHELP /link /LIBPATH:..\msvc6 user32.lib shell32.lib gdi32.lib msvcrt.lib winmm.lib /nodefaultlib:"libc.lib" /subsystem:windows ../SDL2-2.0.4/lib/x86/SDL2.lib kernel32.lib winspool.lib comdlg32.lib advapi32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /DEBUG
 move common\host_common.c common\common.c
 move common\soundlib\libmpg\mpg_common.c common\soundlib\libmpg\common.c