diff --git a/BizHawk.MultiClient/BizHawk.MultiClient.csproj b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
index 7e8efe85bb..99e23705de 100644
--- a/BizHawk.MultiClient/BizHawk.MultiClient.csproj
+++ b/BizHawk.MultiClient/BizHawk.MultiClient.csproj
@@ -101,6 +101,9 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="..\VersionInfo.cs">
+      <Link>VersionInfo.cs</Link>
+    </Compile>
     <Compile Include="AboutBox.cs">
       <SubType>Form</SubType>
     </Compile>
diff --git a/BizHawk.MultiClient/movie/Movie.cs b/BizHawk.MultiClient/movie/Movie.cs
index 40dabb8fc7..7755358227 100644
--- a/BizHawk.MultiClient/movie/Movie.cs
+++ b/BizHawk.MultiClient/movie/Movie.cs
@@ -515,6 +515,7 @@ namespace BizHawk.MultiClient
 			{
 				byte[] state = Global.Emulator.SaveStateBinary();
 				Log.AddState(state);
+				GC.Collect();
 			}
 		}
 
diff --git a/BizHawk.MultiClient/movie/MovieLog.cs b/BizHawk.MultiClient/movie/MovieLog.cs
index e85e49c2cd..c8cd5908ce 100644
--- a/BizHawk.MultiClient/movie/MovieLog.cs
+++ b/BizHawk.MultiClient/movie/MovieLog.cs
@@ -246,7 +246,7 @@ namespace BizHawk.MultiClient
 		private List<StateRecord> StateRecords = new List<StateRecord>();
 		
 		//TODO: Make this size limit configurable by the user
-		private int MaxStateRecordSize = 1024 * 1024 * 1024; //To limit memory usage.
+		private int MaxStateRecordSize = 512 * 1024 * 1024; //To limit memory usage.
 
 		#endregion
 	}