diff --git a/MatterControl.MeshOperations/PlaneCutObject3D.cs b/MatterControl.MeshOperations/PlaneCutObject3D.cs
index 4033f1f73..f9d4747a7 100644
--- a/MatterControl.MeshOperations/PlaneCutObject3D.cs
+++ b/MatterControl.MeshOperations/PlaneCutObject3D.cs
@@ -72,9 +72,7 @@ namespace MatterHackers.MatterControl.DesignTools
 			// remove every face above the cut plane
 			RemoveFacesAboveCut(mesh);
 
-			var aPolys = slice.GetCorrectedWinding();
-
-			aPolys.Vertices().TriangulateFaces(null, mesh, CutHeight);
+			slice.Vertices().TriangulateFaces(null, mesh, CutHeight);
 
 			mesh.Transform(itemMatrix.Inverted);
 
diff --git a/MatterControlLib/ApplicationView/Config/BedConfig.cs b/MatterControlLib/ApplicationView/Config/BedConfig.cs
index 244493d33..b456d8bf0 100644
--- a/MatterControlLib/ApplicationView/Config/BedConfig.cs
+++ b/MatterControlLib/ApplicationView/Config/BedConfig.cs
@@ -644,7 +644,7 @@ namespace MatterHackers.MatterControl
 			this.LoadedGCode = loadedGCode;
 
 			// Constrain to max layers
-			if (this.ActiveLayerIndex > loadedGCode.LayerCount)
+			if (this.ActiveLayerIndex > loadedGCode?.LayerCount)
 			{
 				this.ActiveLayerIndex = loadedGCode.LayerCount;
 			}
diff --git a/StaticData/Stls/auto_pilot.stl b/StaticData/Stls/auto_pilot.stl
new file mode 100644
index 000000000..74821ff9f
Binary files /dev/null and b/StaticData/Stls/auto_pilot.stl differ
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 9693c16ef..ccc47a29c 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 9693c16ef9df11e1ebb3a4ea5a2bf94916341207
+Subproject commit ccc47a29cd2ab3c0ebc3fbc8584e1194f38b20d1