diff --git a/src/command.c b/src/command.c
index 32f69e900..fb59909d1 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1995,15 +1995,7 @@ void CV_RevertNetVars(void)
 	{
 		if (cvar->revert.v.string != NULL)
 		{
-			Setvalue(
-				cvar,
-				cvar->revert.v.string,
-#ifdef DEVELOP
-				(cvar == &cv_cheats)
-#else
-				false
-#endif
-			);
+			Setvalue(cvar, cvar->revert.v.string, false);
 
 			if (cvar->revert.allocated)
 			{
diff --git a/src/g_demo.c b/src/g_demo.c
index 89b2c01c5..2f6a05990 100644
--- a/src/g_demo.c
+++ b/src/g_demo.c
@@ -4302,7 +4302,7 @@ void G_StopDemo(void)
 	P_SaveBufferFree(&demobuf);
 	demo.playback = false;
 	if (demo.title)
-		modeattacking = ATTACKING_NONE;
+		modeattacking = false;
 	demo.title = false;
 	demo.timing = false;
 	singletics = false;