diff --git a/src/g_game.c b/src/g_game.c
index 734db995..bee8246d 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -5941,7 +5941,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 +6002,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 +6029,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 +6051,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]);
 }