diff --git a/Subsurface/Barotrauma.csproj b/Subsurface/Barotrauma.csproj
index bb9218ec6..cc27f9265 100644
--- a/Subsurface/Barotrauma.csproj
+++ b/Subsurface/Barotrauma.csproj
@@ -134,7 +134,6 @@
     <Compile Include="Source\Items\Components\ItemLabel.cs" />
     <Compile Include="Source\Items\Components\StatusHUD.cs" />
     <Compile Include="Source\Items\FixRequirement.cs" />
-    <Compile Include="Source\Networking\EntityRemover.cs" />
     <Compile Include="Source\Networking\EntitySpawner.cs" />
     <Compile Include="Source\Map\EntityGrid.cs" />
     <Compile Include="Source\Map\FireSource.cs" />
diff --git a/Subsurface/Properties/AssemblyInfo.cs b/Subsurface/Properties/AssemblyInfo.cs
index bef2267d4..d8abe3621 100644
--- a/Subsurface/Properties/AssemblyInfo.cs
+++ b/Subsurface/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.5.1.600")]
-[assembly: AssemblyFileVersion("0.5.1.600")]
+[assembly: AssemblyVersion("0.5.3.600")]
+[assembly: AssemblyFileVersion("0.5.3.600")]
diff --git a/Subsurface/Source/Items/Components/Machines/Steering.cs b/Subsurface/Source/Items/Components/Machines/Steering.cs
index 2d82d49a0..d4b564723 100644
--- a/Subsurface/Source/Items/Components/Machines/Steering.cs
+++ b/Subsurface/Source/Items/Components/Machines/Steering.cs
@@ -456,15 +456,14 @@ namespace Barotrauma.Items.Components
             else
             {
                 msg.Write(posToMaintain != null);
-                message.Write(posToMaintain != null);
                 if (posToMaintain != null)
                 {
-                    message.Write(((Vector2)posToMaintain).X);
-                    message.Write(((Vector2)posToMaintain).Y);
+                    msg.Write(((Vector2)posToMaintain).X);
+                    msg.Write(((Vector2)posToMaintain).Y);
                 }
                 else
                 {
-                    message.Write(levelStartTickBox.Selected);
+                    msg.Write(levelStartTickBox.Selected);
                 }
             }
         }
@@ -489,16 +488,16 @@ namespace Barotrauma.Items.Components
                 {
                     posToMaintain = null;
                     maintainPosTickBox.Selected = false;
-                    bool maintainPos = message.ReadBoolean();
-                    if (maintainPos)
+                    bool maintainPoss = msg.ReadBoolean();
+                    if (maintainPoss)
                     {
-                        newPosToMaintain = new Vector2(
-                            message.ReadFloat(), 
-                            message.ReadFloat());
+                        Vector2 newPosToMaintain = new Vector2(
+                            msg.ReadFloat(), 
+                            msg.ReadFloat());
                     }
                     else
                     {
-                        headingToStart = message.ReadBoolean();
+                        bool headingToStart = msg.ReadBoolean();
                     }
                 }
             }
@@ -547,13 +546,13 @@ namespace Barotrauma.Items.Components
                     maintainPosTickBox.Selected = false;
                 }
             }
-            maintainPosTickBox.Selected = newPosToMaintain != null;
-            posToMaintain = newPosToMaintain;
+            maintainPosTickBox.Selected = posToMaintain != null;
+            //posToMaintain = newPosToMaintain;
 
             if (posToMaintain == null && autoPilot)
             {
-                levelStartTickBox.Selected = headingToStart;
-                levelEndTickBox.Selected = !headingToStart;
+                levelStartTickBox.Selected = false;//headingToStart;
+                levelEndTickBox.Selected = true;//!headingToStart;
 
                 UpdatePath();
             }