diff --git a/src/command.c b/src/command.c
index 50692c67..886fc85f 100644
--- a/src/command.c
+++ b/src/command.c
@@ -1355,7 +1355,7 @@ static void Got_NetVar(UINT8 **p, INT32 playernum)
 	Setvalue(cvar, svalue, stealth);
 }
 
-void CV_SaveNetVars(UINT8 **p, boolean demorecording)
+void CV_SaveNetVars(UINT8 **p, boolean isdemorecording)
 {
 	consvar_t *cvar;
 	UINT8 *count_p = *p;
@@ -1365,12 +1365,12 @@ void CV_SaveNetVars(UINT8 **p, boolean demorecording)
 	// the client will reset all netvars to default before loading
 	WRITEUINT16(*p, 0x0000);
 	for (cvar = consvar_vars; cvar; cvar = cvar->next)
-		if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (demorecording && cvar->netid == cv_numlaps.netid))
+		if (((cvar->flags & CV_NETVAR) && !CV_IsSetToDefault(cvar)) || (isdemorecording && cvar->netid == cv_numlaps.netid))
 		{
 			WRITEUINT16(*p, cvar->netid);
 
 			// UGLY HACK: Save proper lap count in net replays
-			if (demorecording && cvar->netid == cv_numlaps.netid)
+			if (isdemorecording && cvar->netid == cv_numlaps.netid)
 			{
 				if (cv_basenumlaps.value &&
 					(!(mapheaderinfo[gamemap - 1]->levelflags & LF_SECTIONRACE)
diff --git a/src/command.h b/src/command.h
index 70bf74a9..71cef9d9 100644
--- a/src/command.h
+++ b/src/command.h
@@ -160,7 +160,7 @@ void CV_AddValue(consvar_t *var, INT32 increment);
 void CV_SaveVariables(FILE *f);
 
 // load/save gamesate (load and save option and for network join in game)
-void CV_SaveNetVars(UINT8 **p, boolean demorecording);
+void CV_SaveNetVars(UINT8 **p, boolean isdemorecording);
 void CV_LoadNetVars(UINT8 **p);
 
 // reset cheat netvars after cheats is deactivated
diff --git a/src/g_game.c b/src/g_game.c
index 47bb8ac9..24804458 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5074,7 +5074,7 @@ void G_WriteGhostTic(mobj_t *ghost)
 	if (abs(ghost->x-oldghost.x) > MAXMOM
 	|| abs(ghost->y-oldghost.y) > MAXMOM
 	|| abs(ghost->z-oldghost.z) > MAXMOM
-	|| leveltime & 255 == 1) // Hack to enable slightly nicer resyncing
+	|| ( leveltime & 255 == 1 )) // Hack to enable slightly nicer resyncing
 	{
 		oldghost.x = ghost->x;
 		oldghost.y = ghost->y;
diff --git a/src/st_stuff.c b/src/st_stuff.c
index 53a1506e..b9046abd 100644
--- a/src/st_stuff.c
+++ b/src/st_stuff.c
@@ -1918,9 +1918,9 @@ static void ST_overlayDrawer(void)
 			else if (splitscreen == 1)
 			{
 				char name[MAXPLAYERNAME+12];
-				sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]);
 
 				INT32 y = (stplyr == &players[displayplayer]) ? 8 : BASEVIDHEIGHT/2-16;
+				sprintf(name, "VIEWPOINT: %s", player_names[stplyr-players]);
 				V_DrawRightAlignedThinString(BASEVIDWIDTH-40, y, V_HUDTRANSHALF|V_ALLOWLOWERCASE|K_calcSplitFlags(V_SNAPTOTOP|V_SNAPTOBOTTOM|V_SNAPTORIGHT), name);
 			}
 			else if (splitscreen)