diff --git a/src/f_finale.c b/src/f_finale.c
index 7ea2e08a7..c620c3ffd 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -220,7 +220,7 @@ void F_StartIntro(void)
 		F_WipeStartScreen();
 		V_DrawFill(0, 0, BASEVIDWIDTH, BASEVIDHEIGHT, 31);
 		F_WipeEndScreen();
-		F_RunWipe(wipedefs[wipe_level_final], false, "FADEMAP0", false, false);
+		F_RunWipe(wipedefs[wipe_intro_toblack], false, "FADEMAP0", false, false);
 	}
 
 	if (introtoplay)
diff --git a/src/f_wipe.c b/src/f_wipe.c
index c4064eec5..c50afcd21 100644
--- a/src/f_wipe.c
+++ b/src/f_wipe.c
@@ -412,6 +412,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean r
 	(void)drawMenu;
 	(void)colormap;
 	(void)reverse;
+	(void)encorewiggle;
 #else
 	tic_t nowtime;
 	UINT8 wipeframe = 0;
@@ -462,7 +463,7 @@ void F_RunWipe(UINT8 wipetype, boolean drawMenu, const char *colormap, boolean r
 #endif
 		F_DoWipe(fmask, fcolor, reverse);
 		if (encorewiggle)
-			F_DoEncoreWiggle(wipeframe);
+			F_DoEncoreWiggle(wipeframe); // Can't think of a better way to run this on fades, unfortunately.
 
 		I_OsPolling();
 		I_UpdateNoBlit();