diff --git a/src/d_clisrv.c b/src/d_clisrv.c
index 4468502d0..d1dee3985 100644
--- a/src/d_clisrv.c
+++ b/src/d_clisrv.c
@@ -2111,7 +2111,7 @@ static void CL_ConnectToServer(boolean viams)
 
 	if (i != -1)
 	{
-		UINT8 num = serverlist[i].info.gametype;
+		UINT16 num = serverlist[i].info.gametype;
 		const char *gametypestr = NULL;
 		CONS_Printf(M_GetText("Connecting to: %s\n"), serverlist[i].info.servername);
 		if (num < gametypecount)
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 1e9b4f14a..8cbfa77d3 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -3026,7 +3026,7 @@ static void HU_DrawRankings(void)
 	// draw the current gametype in the lower right
 	HU_drawGametype();
 
-	if (gametype != GT_RACE && gametype != GT_COMPETITION && gametype != GT_COOP)
+	if (!G_PlatformGametype())
 	{
 		if (cv_timelimit.value && timelimitintics > 0)
 		{
@@ -3083,7 +3083,7 @@ static void HU_DrawRankings(void)
 		if (!playeringame[j])
 			continue;
 
-		if (gametype != GT_COOP && players[j].spectator)
+		if (!G_PlatformGametype() && players[j].spectator)
 			continue;
 
 		for (i = 0; i < MAXPLAYERS; i++)
@@ -3091,7 +3091,7 @@ static void HU_DrawRankings(void)
 			if (!playeringame[i])
 				continue;
 
-			if (gametype != GT_COOP && players[i].spectator)
+			if (!G_PlatformGametype() && players[i].spectator)
 				continue;
 
 			if (gametype == GT_RACE)