diff --git a/src/f_finale.c b/src/f_finale.c
index 17961f1a5..0932550fd 100644
--- a/src/f_finale.c
+++ b/src/f_finale.c
@@ -459,9 +459,13 @@ static const char *credits[] = {
 	"\"ZarroTsu\"",
 	"",
 	"\1External Artists",
+	"\"1-Up Mason\"",
+	"\"Chengi\"",
 	"\"Chrispy\"",
 	"\"DirkTheHusky\"",
+	"\"LJSTAR\"",
 	"\"MotorRoach\"",
+	"\"Mr. McScrewup\"",
 	"\"Nev3r\"",
 	"\"Ritz\"",
 	"\"Rob\"",
@@ -470,6 +474,7 @@ static const char *credits[] = {
 	"\"Spherallic\"",
 	"\"VAdaPEGA\"",
 	"\"Virt\"",
+	"\"Voltrix\"",
 	"\"zxyspku\"",
 	"",
 	"\1Sound Design",
diff --git a/src/g_game.c b/src/g_game.c
index 0dcf2a20b..d9dd3e3cb 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -1249,7 +1249,11 @@ void G_BuildTiccmd(ticcmd_t *cmd, INT32 realtics, UINT8 ssplayer)
 
 	if (demo.playback) return;
 
-	player = &players[displayplayers[ssplayer-1]];
+	if (ssplayer == 1)
+		player = &players[consoleplayer];
+	else
+		player = &players[displayplayers[ssplayer-1]];
+		
 	if (ssplayer == 2)
 		thiscam = (player->bot == 2 ? &camera[0] : &camera[ssplayer-1]);
 	else
@@ -5941,7 +5945,8 @@ void G_StoreRewindInfo(void)
 
 void G_PreviewRewind(tic_t previewtime)
 {
-	size_t i, j;
+	SINT8 i;
+	size_t j;
 	fixed_t tweenvalue = 0;
 	rewindinfo_t *info = rewindhead, *next_info = rewindhead;
 
@@ -6001,13 +6006,14 @@ void G_PreviewRewind(tic_t previewtime)
 			players[i].kartstuff[j] = info->playerinfo[i].player.kartstuff[j];
 	}
 
-	for (i = splitscreen+1; i > 0; i--)
+	for (i = splitscreen; i >= 0; i--)
 		P_ResetCamera(&players[displayplayers[i]], &camera[i]);
 }
 
 void G_ConfirmRewind(tic_t rewindtime)
 {
-	tic_t i;
+	SINT8 i;
+	tic_t j;
 	boolean oldmenuactive = menuactive, oldsounddisabled = sound_disabled;
 
 	INT32 olddp1 = displayplayers[0], olddp2 = displayplayers[1], olddp3 = displayplayers[2], olddp4 = displayplayers[3];
@@ -6027,10 +6033,10 @@ void G_ConfirmRewind(tic_t rewindtime)
 
 	G_DoPlayDemo(NULL); // Restart the current demo
 
-	for (i = 0; i < rewindtime && leveltime < rewindtime; i++)
+	for (j = 0; j < rewindtime && leveltime < rewindtime; i++)
 	{
 		//TryRunTics(1);
-		G_Ticker((i % NEWTICRATERATIO) == 0);
+		G_Ticker((j % NEWTICRATERATIO) == 0);
 	}
 
 	demo.rewinding = false;
@@ -6049,7 +6055,7 @@ void G_ConfirmRewind(tic_t rewindtime)
 	R_ExecuteSetViewSize();
 	G_ResetViews();
 
-	for (i = splitscreen+1; i > 0; i--)
+	for (i = splitscreen; i >= 0; i--)
 		P_ResetCamera(&players[displayplayers[i]], &camera[i]);
 }