diff --git a/BizHawk.Client.EmuHawk/Api/ApiManager.cs b/BizHawk.Client.EmuHawk/Api/ApiManager.cs
index fc41386aac..812fba4a8a 100644
--- a/BizHawk.Client.EmuHawk/Api/ApiManager.cs
+++ b/BizHawk.Client.EmuHawk/Api/ApiManager.cs
@@ -1,10 +1,8 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Reflection;
 
-using BizHawk.Common.ReflectionExtensions;
 using BizHawk.Emulation.Common;
 using BizHawk.Client.ApiHawk;
 using BizHawk.Client.Common;
@@ -14,7 +12,7 @@ namespace BizHawk.Client.EmuHawk
 {
 	public static class ApiManager
 	{
-		private static ApiContainer container;
+		private static ApiContainer _container;
 		private static IExternalApiProvider Register(IEmulatorServiceProvider serviceProvider)
 		{
 			foreach (var api in Assembly.Load("BizHawk.Client.Common").GetTypes()
@@ -26,8 +24,8 @@ namespace BizHawk.Client.EmuHawk
 				ServiceInjector.UpdateServices(serviceProvider, instance);
 				Libraries.Add(api, instance);
 			}
-			container = new ApiContainer(Libraries);
-			return new BasicApiProvider(container);
+			_container = new ApiContainer(Libraries);
+			return new BasicApiProvider(_container);
 		}
 
 		private static readonly Dictionary<Type, IExternalApi> Libraries = new Dictionary<Type, IExternalApi>();
diff --git a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
index 96733b23f7..73a202b9a1 100644
--- a/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
+++ b/BizHawk.Client.EmuHawk/tools/TAStudio/TAStudio.cs
@@ -750,7 +750,7 @@ namespace BizHawk.Client.EmuHawk
 		private void DisengageTastudio()
 		{
 			Mainform.PauseOnFrame = null;
-			GlobalWin.OSD.AddMessage("TAStudio disengaged");
+			Mainform.AddOnScreenMessage("TAStudio disengaged");
 			Global.MovieSession.Movie = MovieService.DefaultInstance;
 			Mainform.TakeBackControl();
 			Global.Config.MovieEndAction = _originalEndAction;