diff --git a/engine/server/sv_init.c b/engine/server/sv_init.c
index 5af5637c..42ced1f0 100644
--- a/engine/server/sv_init.c
+++ b/engine/server/sv_init.c
@@ -1000,7 +1000,7 @@ qboolean SV_SpawnServer( const char *mapname, const char *startspot, qboolean ba
 
 	// force normal player collisions for single player
 	if( svs.maxclients == 1 )
-		Cvar_SetValue( "sv_clienttrace", 1 );
+		Cvar_DirectSet( &sv_clienttrace, "1" );
 
 	// copy gamemode into svgame.globals
 	svgame.globals->deathmatch = deathmatch.value;
@@ -1011,9 +1011,6 @@ qboolean SV_SpawnServer( const char *mapname, const char *startspot, qboolean ba
 	Cvar_DirectFullSet( &sv_background, sv.background ? "1" : "0", FCVAR_READ_ONLY );
 	Cvar_DirectFullSet( &cl_background, sv.background ? "1" : "0", FCVAR_READ_ONLY );
 
-	// force normal player collisions for single player
-	if( svs.maxclients == 1 ) Cvar_SetValue( "sv_clienttrace", 1 );
-
 	// allow loading maps from subdirectories, strip extension anyway
 	Q_strncpy( sv.name, mapname, sizeof( sv.name ));
 	COM_StripExtension( sv.name );
diff --git a/engine/server/sv_pmove.c b/engine/server/sv_pmove.c
index d3989319..13e1de83 100644
--- a/engine/server/sv_pmove.c
+++ b/engine/server/sv_pmove.c
@@ -713,7 +713,7 @@ static void SV_SetupMoveInterpolant( sv_client_t *cl )
 	if( sv_maxunlag.value != 0.0f )
 	{
 		if( sv_maxunlag.value < 0.0f )
-			Cvar_DirectSetValue( &sv_maxunlag, 0.0f );
+			Cvar_DirectSet( &sv_maxunlag, "0" );
 
 		latency = Q_min( latency, sv_maxunlag.value );
 	}