diff --git a/src/console.c b/src/console.c
index 7faf954d..43d5df2d 100644
--- a/src/console.c
+++ b/src/console.c
@@ -1625,6 +1625,6 @@ void CON_Drawer(void)
 	if (con_curlines > 0)
 		CON_DrawConsole();
 	else if (gamestate == GS_LEVEL || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE || gamestate == GS_CREDITS
-		|| gamestate == GS_VOTING)
+		|| gamestate == GS_VOTING || gamestate == GS_EVALUATION || gamestate == GS_WAITINGPLAYERS)
 		CON_DrawHudlines();
 }
diff --git a/src/d_main.c b/src/d_main.c
index 78c4fca6..15e11b0d 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -369,6 +369,7 @@ static void D_Display(void)
 
 		case GS_EVALUATION:
 			F_GameEvaluationDrawer();
+			HU_Erase();
 			HU_Drawer();
 			break;
 
@@ -390,6 +391,7 @@ static void D_Display(void)
 			// The clientconnect drawer is independent...
 			// I don't think HOM from nothing drawing is independent...
 			F_WaitingPlayersDrawer();
+			HU_Erase();
 			HU_Drawer();
 		case GS_DEDICATEDSERVER:
 		case GS_NULL:
diff --git a/src/hu_stuff.c b/src/hu_stuff.c
index 63d75c76..6288c629 100644
--- a/src/hu_stuff.c
+++ b/src/hu_stuff.c
@@ -1180,7 +1180,7 @@ void HU_Drawer(void)
 	 || gamestate == GS_INTERMISSION || gamestate == GS_CUTSCENE
 	 || gamestate == GS_CREDITS      || gamestate == GS_EVALUATION
 	 || gamestate == GS_GAMEEND
-	 || gamestate == GS_VOTING) // SRB2kart
+	 || gamestate == GS_VOTING || gamestate == GS_WAITINGPLAYERS) // SRB2kart
 		return;
 
 	// draw multiplayer rankings
diff --git a/src/m_menu.c b/src/m_menu.c
index c8e7fae8..0000fa55 100644
--- a/src/m_menu.c
+++ b/src/m_menu.c
@@ -6960,7 +6960,7 @@ Update the maxplayers label...
 	V_DrawString(x+8,y+12, V_MONOSPACE, setupm_ip);
 
 	// draw text cursor for name
-	if (itemOn == 5 //0
+	if (itemOn == 7
 	    && skullAnimCounter < 4)   //blink cursor
 		V_DrawCharacter(x+8+V_StringWidth(setupm_ip, V_MONOSPACE),y+12,'_',false);
 #endif