diff --git a/BizHawk.MultiClient/GBAtools/GBAGPUView.cs b/BizHawk.MultiClient/GBAtools/GBAGPUView.cs
index 31559a97a4..ab39bf9874 100644
--- a/BizHawk.MultiClient/GBAtools/GBAGPUView.cs
+++ b/BizHawk.MultiClient/GBAtools/GBAGPUView.cs
@@ -549,7 +549,10 @@ namespace BizHawk.MultiClient.GBAtools
 					if (bg1.ShouldDraw) bg1.bmpView.Clear();
 					if (bg2.ShouldDraw) DrawAffineBG(2, bg2);
 					if (bg3.ShouldDraw) DrawAffineBG(3, bg3);
-					if (bgtiles16.ShouldDraw) bgtiles16.bmpView.Clear(); // NB: no 4pp bgtiles in mode 2
+					// while there are no 4bpp tiles possible in mode 2, there might be some in memory
+					// due to midframe mode switching.  no real reason not to display them if that's
+					// what the user wants to see
+					if (bgtiles16.ShouldDraw) DrawBGTiles(bgtiles16, false);
 					if (bgtiles256.ShouldDraw) DrawBGTiles(bgtiles256, true);
 					if (sptiles16.ShouldDraw) DrawSpriteTiles(sptiles16, false, false);
 					if (sptiles256.ShouldDraw) DrawSpriteTiles(sptiles256, false, true);
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index 00671cbaf0..5a90255759 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -683,7 +683,8 @@ namespace BizHawk.MultiClient
 				Log.TruncateMovie(Log.Length);
 				Mode = MOVIEMODE.FINISHED;
 			}
-			Rerecords++;
+			if (IsCountingRerecords)
+				Rerecords++;
 			reader.Close();
 		}