diff --git a/BizHawk.MultiClient/MainForm.cs b/BizHawk.MultiClient/MainForm.cs
index a81f36f3f6..8854925898 100644
--- a/BizHawk.MultiClient/MainForm.cs
+++ b/BizHawk.MultiClient/MainForm.cs
@@ -2104,7 +2104,7 @@ namespace BizHawk.MultiClient
 
 		public void PlayMovieFromBeginning()
 		{
-			if (InputLog.GetMovieMode() != MOVIEMODE.INACTIVE)
+			if (UserMovie.GetMovieMode() != MOVIEMODE.INACTIVE)
 			{
 				LoadRom(CurrentlyOpenRom);
 				UserMovie.StartPlayback();
diff --git a/BizHawk.MultiClient/RenderPanel.cs b/BizHawk.MultiClient/RenderPanel.cs
index 6e2ad50f37..eaa0829241 100644
--- a/BizHawk.MultiClient/RenderPanel.cs
+++ b/BizHawk.MultiClient/RenderPanel.cs
@@ -200,7 +200,7 @@ namespace BizHawk.MultiClient
 			Sprite = new Sprite(Device);
 			Texture = new ImageTexture(Device);
 			MessageFont = new Font(Device, 16, 0, FontWeight.Bold, 1, false, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
-			AlertFont = new Font(Device, 20, 0, FontWeight.ExtraBold, 1, true, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
+			AlertFont = new Font(Device, 16, 0, FontWeight.ExtraBold, 1, true, CharacterSet.Default, Precision.Default, FontQuality.Default, PitchAndFamily.Default | PitchAndFamily.DontCare, "Courier");
 		}
 
 		public void Render()
diff --git a/BizHawk.MultiClient/tools/TAStudio.cs b/BizHawk.MultiClient/tools/TAStudio.cs
index 76cadd006f..63e0d52b4e 100644
--- a/BizHawk.MultiClient/tools/TAStudio.cs
+++ b/BizHawk.MultiClient/tools/TAStudio.cs
@@ -12,13 +12,16 @@ namespace BizHawk.MultiClient
 	public partial class TAStudio : Form
 	{
 		//TODO:
-		//Crash when closing TASStudio
 		//Right-click - Go to current frame
 		//Clicking a frame should go there
 		//Multiple timeline system
 		//Macro listview
 		//	Double click brings up a macro editing window
 		//NES Controls virtualpad (Power-on & Reset, eventually FDS options)
+		//SMS virtualpad
+		//PCE virtualpad
+		//Dynamic virtualpad system based on platform
+		//ensureVisible when recording
 
 		int defaultWidth;     //For saving the default size of the dialog, so the user can restore if desired
 		int defaultHeight;
@@ -41,7 +44,11 @@ namespace BizHawk.MultiClient
 
 		public void UpdateValues()
 		{
-			DisplayList();
+			if (!this.IsHandleCreated || this.IsDisposed) return;
+			if (Global.MainForm.UserMovie.GetMovieMode() == MOVIEMODE.INACTIVE)
+				TASView.ItemCount = 0;
+			else
+				DisplayList();
 		}
 
 		public string GetMnemonic()