diff --git a/src/d_main.c b/src/d_main.c
index bf6af7ea..69821698 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -317,11 +317,12 @@ static void D_Display(void)
 				V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
 				F_WipeEndScreen();
 				F_RunWipe(wipedefs[wipedefindex], gamestate != GS_TIMEATTACK);
-				if (wipegamestate == GS_LEVEL && rendermode != render_none)
-				{
-					V_SetPaletteLump("PLAYPAL"); // Reset the palette
-					R_ReInitColormaps(0, LUMPERROR);
-				}
+			}
+
+			if (wipegamestate == GS_LEVEL && rendermode != render_none)
+			{
+				V_SetPaletteLump("PLAYPAL"); // Reset the palette
+				R_ReInitColormaps(0, LUMPERROR);
 			}
 
 			F_WipeStartScreen();
diff --git a/src/g_game.c b/src/g_game.c
index cb7f276c..55dbeb3e 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -3229,7 +3229,7 @@ INT16 G_RandMap(INT16 tolflags, INT16 pprevmap, boolean dontadd, boolean ignoreb
 
 		if (!ignorebuffer)
 		{
-			for (bufx = 0; bufx < NUMMAPS; bufx++)
+			for (bufx = 0; bufx < (maphell ? 3 : NUMMAPS); bufx++)
 			{
 				if (randmapbuffer[bufx] == -1) // Rest of buffer SHOULD be empty
 					break;