diff --git a/engine/client/console.c b/engine/client/console.c
index 0cd893da..3285c585 100644
--- a/engine/client/console.c
+++ b/engine/client/console.c
@@ -1941,7 +1941,7 @@ void Con_DrawConsole( void )
 	{
 		if( !cl_allow_levelshots.value && !cls.timedemo )
 		{
-			if(( Cvar_VariableInteger( "cl_background" ) || Cvar_VariableInteger( "sv_background" )) && cls.key_dest != key_console )
+			if( cls.key_dest != key_console && ( Cvar_VariableInteger( "cl_background" ) || Cvar_VariableInteger( "sv_background" )))
 				con.vislines = con.showlines = 0;
 			else con.vislines = con.showlines = refState.height;
 		}
diff --git a/engine/common/cmd.c b/engine/common/cmd.c
index 50339a1b..db4b1efb 100644
--- a/engine/common/cmd.c
+++ b/engine/common/cmd.c
@@ -1214,13 +1214,13 @@ void Cmd_Unlink( int group )
 	cmd_t	**prev;
 	int	count = 0;
 
-	if( Cvar_VariableInteger( "host_gameloaded" ) && FBitSet( group, CMD_SERVERDLL ))
+	if( FBitSet( group, CMD_SERVERDLL ) && Cvar_VariableInteger( "host_gameloaded" ))
 		return;
 
-	if( Cvar_VariableInteger( "host_clientloaded" ) && FBitSet( group, CMD_CLIENTDLL ))
+	if( FBitSet( group, CMD_CLIENTDLL ) && Cvar_VariableInteger( "host_clientloaded" ))
 		return;
 
-	if( Cvar_VariableInteger( "host_gameuiloaded" ) && FBitSet( group, CMD_GAMEUIDLL ))
+	if( FBitSet( group, CMD_GAMEUIDLL ) && Cvar_VariableInteger( "host_gameuiloaded" ))
 		return;
 
 	prev = &cmd_functions;
diff --git a/engine/ref_api.h b/engine/ref_api.h
index fbb8521c..273fe0e1 100644
--- a/engine/ref_api.h
+++ b/engine/ref_api.h
@@ -61,8 +61,6 @@ GNU General Public License for more details.
 #define FCONTEXT_CORE_PROFILE		BIT( 0 )
 #define FCONTEXT_DEBUG_ARB		BIT( 1 )
 
-#define FCVAR_READ_ONLY		(1<<17)	// cannot be set by user at all, and can't be requested by CvarGetPointer from game dlls
-
 // screenshot types
 #define VID_SCREENSHOT	0
 #define VID_LEVELSHOT	1
diff --git a/engine/server/sv_client.c b/engine/server/sv_client.c
index 0386e6e9..edaff653 100644
--- a/engine/server/sv_client.c
+++ b/engine/server/sv_client.c
@@ -1992,7 +1992,7 @@ static qboolean SV_Noclip_f( sv_client_t *cl )
 {
 	edict_t	*pEntity = cl->edict;
 
-	if( !Cvar_VariableInteger( "sv_cheats" ) || sv.background )
+	if( sv.background || !Cvar_VariableInteger( "sv_cheats" ))
 		return true;
 
 	if( pEntity->v.movetype != MOVETYPE_NOCLIP )
@@ -2018,7 +2018,7 @@ static qboolean SV_Godmode_f( sv_client_t *cl )
 {
 	edict_t	*pEntity = cl->edict;
 
-	if( !Cvar_VariableInteger( "sv_cheats" ) || sv.background )
+	if( sv.background || !Cvar_VariableInteger( "sv_cheats" ))
 		return true;
 
 	pEntity->v.flags = pEntity->v.flags ^ FL_GODMODE;
@@ -2039,7 +2039,7 @@ static qboolean SV_Notarget_f( sv_client_t *cl )
 {
 	edict_t	*pEntity = cl->edict;
 
-	if( !Cvar_VariableInteger( "sv_cheats" ) || sv.background )
+	if( sv.background || !Cvar_VariableInteger( "sv_cheats" ))
 		return true;
 
 	pEntity->v.flags = pEntity->v.flags ^ FL_NOTARGET;