diff --git a/BizHawk.Client.Common/lua/LuaFile.cs b/BizHawk.Client.Common/lua/LuaFile.cs
index 4200a35097..0358c3ffa5 100644
--- a/BizHawk.Client.Common/lua/LuaFile.cs
+++ b/BizHawk.Client.Common/lua/LuaFile.cs
@@ -49,7 +49,8 @@
 		public void Stop()
 		{
 			State = RunState.Disabled;
-			Thread.GetTable("keepalives")[Thread] = null;
+			if(NLua.Lua.WhichLua == "NLua")
+				Thread.GetTable("keepalives")[Thread] = null;
 			Thread = null;
 		}
 
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
index a8bb730dd8..97c8ac58dd 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.cs
@@ -18,7 +18,8 @@ namespace BizHawk.Client.EmuHawk
 		public EmuLuaLibrary()
 		{
 			Docs = new LuaDocumentation();
-			_lua["keepalives"] = _lua.NewTable();
+			if(NLua.Lua.WhichLua == "NLua")
+				_lua["keepalives"] = _lua.NewTable();
 		}
 
 		public EmuLuaLibrary(IEmulatorServiceProvider serviceProvider)
@@ -177,8 +178,12 @@ namespace BizHawk.Client.EmuHawk
 			var content = File.ReadAllText(file);
 			var main = lua.LoadString(content, "main");
 			lua.Push(main); // push main function on to stack for subsequent resuming
-			_lua.GetTable("keepalives")[lua] = 1;
-			_lua.Pop();
+			if (NLua.Lua.WhichLua == "NLua")
+			{
+				_lua.GetTable("keepalives")[lua] = 1;
+				//this not being run is the origin of a memory leak if you restart scripts too many times
+				_lua.Pop();
+			}
 			return lua;
 		}
 
@@ -186,7 +191,8 @@ namespace BizHawk.Client.EmuHawk
 		{
 			_currThread = _lua.NewThread();
 			_currThread.DoString(command);
-			_lua.Pop();
+			if (NLua.Lua.WhichLua == "NLua")
+				_lua.Pop();
 		}
 
 		public ResumeResult ResumeScript(Lua script)
diff --git a/LuaInterface/LuaInterface/Lua.cs b/LuaInterface/LuaInterface/Lua.cs
index 74ec122d27..bf4dc94404 100644
--- a/LuaInterface/LuaInterface/Lua.cs
+++ b/LuaInterface/LuaInterface/Lua.cs
@@ -26,6 +26,8 @@ namespace NLua
     public class Lua : IDisposable
 	{
 
+		public static readonly string WhichLua = "LuaInterface";
+
 		static string init_luanet =
 			"local metatable = {}									\n"+
 			"local import_type = luanet.import_type							\n"+
diff --git a/LuaInterface/LuaInterface/LuaInterface.csproj b/LuaInterface/LuaInterface/LuaInterface.csproj
index c658055a7b..3885a26f3f 100644
--- a/LuaInterface/LuaInterface/LuaInterface.csproj
+++ b/LuaInterface/LuaInterface/LuaInterface.csproj
@@ -145,7 +145,7 @@
     <CodeAnalysisRuleDirectories>;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules</CodeAnalysisRuleDirectories>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>..\..\references\x64\</OutputPath>
+    <OutputPath>..\..\output\dll\</OutputPath>
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
diff --git a/output/dll/LuaInterface.dll b/output/dll/LuaInterface.dll
index 0ce2ca51cc..3f048ff5da 100644
Binary files a/output/dll/LuaInterface.dll and b/output/dll/LuaInterface.dll differ
diff --git a/output/dll/nlua/NLua.dll b/output/dll/nlua/NLua.dll
index 72b3a428d5..cf7b21bb1c 100644
Binary files a/output/dll/nlua/NLua.dll and b/output/dll/nlua/NLua.dll differ