diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 32682964cc..5208f20535 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -108,7 +108,6 @@
     <Compile Include="PlaceBuilding.cs" />
     <Compile Include="Player.cs" />
     <Compile Include="Race.cs" />
-    <Compile Include="Support\SharedResources.cs" />
     <Compile Include="Graphics\Sheet.cs" />
     <Compile Include="Support\Log.cs" />
     <Compile Include="PathFinder.cs" />
diff --git a/OpenRa.Game/PathFinder.cs b/OpenRa.Game/PathFinder.cs
index 21eb448f9a..fb32afc68d 100644
--- a/OpenRa.Game/PathFinder.cs
+++ b/OpenRa.Game/PathFinder.cs
@@ -63,7 +63,7 @@ namespace OpenRa.Game
 			for( int i = 0 ; i < path.Count ; i++ )
 			{
 				var sl = path[ i ];
-				if( i == 0 || (Game.BuildingInfluence.CanMoveHere(path[i]) && Game.UnitInfluence.GetUnitAt( path[ i ] ) == null) )
+				if( /*i == 0 || */(Game.BuildingInfluence.CanMoveHere(path[i]) && Game.UnitInfluence.GetUnitAt( path[ i ] ) == null) )
 				{
 					queue.Add( new PathDistance( estimator( sl ), sl ) );
 					cellInfo[ sl.X, sl.Y ] = new CellInfo( cost, prev, false );
diff --git a/OpenRa.Game/TerrainCosts.cs b/OpenRa.Game/TerrainCosts.cs
index d9af77aa54..0d84a97873 100644
--- a/OpenRa.Game/TerrainCosts.cs
+++ b/OpenRa.Game/TerrainCosts.cs
@@ -36,13 +36,10 @@ namespace OpenRa.Game
 
 		static TerrainCosts()
 		{
-            IniFile file = SharedResources.Rules;
-
 			for( int i = 0 ; i < 10 ; i++ )
 			{
-				if( i == 4 )
-					continue;
-				IniSection section = file.GetSection( ( (TerrainMovementType)i ).ToString() );
+				if( i == 4 ) continue;
+				var section = Rules.AllRules.GetSection( ( (TerrainMovementType)i ).ToString() );
 				for( int j = 0 ; j < 4 ; j++ )
 				{
 					string val = section.GetValue( ( (UnitMovementType)j ).ToString(), "0%" );