diff --git a/BizHawk.Client.EmuHawk/MainForm.Events.cs b/BizHawk.Client.EmuHawk/MainForm.Events.cs
index d92c0ef4ec..c9319da69e 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Events.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Events.cs
@@ -1846,7 +1846,7 @@ namespace BizHawk.Client.EmuHawk
 		{
 			if (new N64ControllersSetup().ShowDialog() == DialogResult.OK)
 			{
-				GlobalWin.MainForm.FlagNeedsReboot();
+				FlagNeedsReboot();
 				GlobalWin.OSD.AddMessage("Controller settings saved but a core reboot is required");
 			}
 			else
diff --git a/BizHawk.Client.EmuHawk/MainForm.Movie.cs b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
index fe501c962a..094fae72c9 100644
--- a/BizHawk.Client.EmuHawk/MainForm.Movie.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.Movie.cs
@@ -31,7 +31,7 @@ namespace BizHawk.Client.EmuHawk
 				return false;
 			}
 
-			LoadRom(GlobalWin.MainForm.CurrentlyOpenRom);
+			LoadRom(CurrentlyOpenRom);
 
 			if (Global.MovieSession.PreviousNES_InQuickNES.HasValue)
 			{
diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index 54e7cb046c..625d014503 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -2976,7 +2976,7 @@ namespace BizHawk.Client.EmuHawk
 				}
 				else
 				{
-					var token = aw.AcquireVideoCodecToken(GlobalWin.MainForm);
+					var token = aw.AcquireVideoCodecToken(this);
 					if (token == null)
 					{
 						GlobalWin.OSD.AddMessage("A/V capture canceled.");