diff --git a/OpenRa.BlockCacheVisualizer/OpenRa.BlockCacheVisualizer.csproj b/OpenRa.BlockCacheVisualizer/OpenRa.BlockCacheVisualizer.csproj
index 3d1d52c839..7bcfeef9bb 100644
--- a/OpenRa.BlockCacheVisualizer/OpenRa.BlockCacheVisualizer.csproj
+++ b/OpenRa.BlockCacheVisualizer/OpenRa.BlockCacheVisualizer.csproj
@@ -19,6 +19,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -28,6 +29,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index 88233e0e8d..200e98133b 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -28,6 +28,10 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="MixDecrypt, Version=0.0.0.0, Culture=neutral, processorArchitecture=x86">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\release\MixDecrypt.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
@@ -51,10 +55,6 @@
     <Compile Include="Tuple.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\MixDecrypt\MixDecrypt.vcproj">
-      <Project>{6F5D4280-3D23-41FF-AE2A-511B5553E377}</Project>
-      <Name>MixDecrypt</Name>
-    </ProjectReference>
     <ProjectReference Include="..\OpenRa.Core\OpenRa.Core.csproj">
       <Project>{1B60782F-B2DD-43F1-B51D-B798485F317C}</Project>
       <Name>OpenRa.Core</Name>
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 243e37438d..5a012a8d96 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -29,7 +29,7 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BluntDx, Version=1.0.2750.2905, Culture=neutral, processorArchitecture=x86">
+    <Reference Include="BluntDx, Version=1.0.2752.7426, Culture=neutral, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\release\BluntDx.dll</HintPath>
     </Reference>
diff --git a/OpenRa.Game/Sidebar.cs b/OpenRa.Game/Sidebar.cs
index 0ee8d6bb71..41eeb09dda 100644
--- a/OpenRa.Game/Sidebar.cs
+++ b/OpenRa.Game/Sidebar.cs
@@ -74,8 +74,8 @@ namespace OpenRa.Game
 					DrawSprite( sprite, ref unitPos );
 			}
 
-			Fill(viewport.Size.Y, buildPos);
-			Fill(viewport.Size.Y, unitPos);
+			Fill( viewport.Location.Y + viewport.Size.Y, buildPos );
+			Fill( viewport.Location.Y + viewport.Size.Y, unitPos );
 
 			spriteRenderer.Flush();
 		}
diff --git a/OpenRa.Game/TerrainRenderer.cs b/OpenRa.Game/TerrainRenderer.cs
index 6852667354..373d39191b 100644
--- a/OpenRa.Game/TerrainRenderer.cs
+++ b/OpenRa.Game/TerrainRenderer.cs
@@ -58,7 +58,7 @@ namespace OpenRa.Game
 			indexBuffer.SetData(indices.ToArray());
 		}
 
-		public void Draw()
+		void Draw()
 		{
 			int indicesPerRow = map.Width * 6;
 			int verticesPerRow = map.Width * 4;
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index 9db54e48da..4445791673 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -25,7 +25,7 @@ namespace OpenRa.Game
 
 		public void Add(Actor a) { actors.Add(a); }
 
-		public void Draw()
+		void Draw()
 		{
 			Range<float2> range = new Range<float2>(viewport.Location, viewport.Location + viewport.Size);