diff --git a/src/d_main.c b/src/d_main.c
index e287d5c3810574f5781cad333fd57bb41542dda9..bad78c53070174e215416ce1fe9ed51b090c84c0 100644
--- a/src/d_main.c
+++ b/src/d_main.c
@@ -298,8 +298,8 @@ void D_ProcessEvents(void)
 // added comment : there is a wipe eatch change of the gamestate
 gamestate_t wipegamestate = GS_LEVEL;
 // -1: Default; 0-n: Wipe index; INT16_MAX: do not wipe
-INT16 wipetypepre = INT16_MAX;
-INT16 wipetypepost = INT16_MAX;
+INT16 wipetypepre = -1;
+INT16 wipetypepost = -1;
 
 static void D_Display(void)
 {
@@ -749,8 +749,6 @@ void D_SRB2Loop(void)
 
 	// hack to start on a nice clear console screen.
 	COM_ImmedExecute("cls;version");
-	// hack to prevent white flash upon initial window resize
-	V_DrawFill(0,0,BASEVIDWIDTH,BASEVIDHEIGHT,31);
 
 	I_FinishUpdate(); // page flip or blit buffer
 	/*
diff --git a/src/f_finale.c b/src/f_finale.c
index 5fb901e0def0f3b2b4425f59cb700fe877a97273..810af4e82f3ea4f08d035b626a6afffef52a0467 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -313,7 +313,7 @@ const char *introtext[NUMINTROSCENES];
 
 static tic_t introscenetime[NUMINTROSCENES] =
 {
-	6*TICRATE,	// STJr Presents
+	5*TICRATE,	// STJr Presents
 	10*TICRATE + (TICRATE/2),	// Two months had passed since...
 	12*TICRATE + ((TICRATE/4) * 3),	// As it was about to drain the rings...
 	12*TICRATE + (TICRATE/4),					// What Sonic, Tails, and Knuckles...
@@ -623,15 +623,15 @@ void F_IntroDrawer(void)
 		{
 			V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
 
-			if (intro_curtime > TICRATE-17 && intro_curtime < 2*TICRATE-22) // Make the text shine!
+			if (intro_curtime < TICRATE-5) // Make the text shine!
 			{
-				sprintf(stjrintro, "STJRI%03u", intro_curtime-19);
+				sprintf(stjrintro, "STJRI%03u", intro_curtime-1);
 			}
-			else if (intro_curtime >= 2*TICRATE-23 && intro_curtime < 2*TICRATE-3) // Pause on black screen for just a second
+			else if (intro_curtime >= TICRATE-6 && intro_curtime < 2*TICRATE-20) // Pause on black screen for just a second
 			{
 				return;
 			}
-			else if (intro_curtime == 2*TICRATE-2)
+			else if (intro_curtime == 2*TICRATE-19)
 			{
 				// Fade in the text
 				// The text fade out is automatically handled when switching to a new intro scene
@@ -950,7 +950,7 @@ void F_IntroTicker(void)
 
 	if (rendermode != render_none)
 	{
-		if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-2)
+		if (intro_scenenum == 0 && intro_curtime == 2*TICRATE-19)
 		{
 			S_ChangeMusicInternal("_stjr", false);