diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice
index 54748bc6d..d58665f5c 160000
--- a/Submodules/MatterSlice
+++ b/Submodules/MatterSlice
@@ -1 +1 @@
-Subproject commit 54748bc6d030bb65593e17b76d320884a7747eb2
+Subproject commit d58665f5c5a25ed2fae2a9418c6c56fe70a59fe8
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 3be867c69..f52f803dc 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 3be867c69f3fedc3dbee0874466743e75bc2062d
+Subproject commit f52f803dc37a2eb3fe4ebe1b2507418d5d2db4ba
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index 661ea5a25..ae584d098 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -329,14 +329,14 @@ namespace MatterHackers.MatterControl.Tests.Automation
 		{
 			SystemWindow systemWindow;
 			testRunner.GetWidgetByName("Hardware Tab", out systemWindow, 10);
-			testRunner.WaitforDraw(systemWindow)
+            testRunner.WaitFor(() => testRunner.NameExists("Start New Design"), 5)
 				// close the welcome message
 				.ClickByName("Start New Design")
-				.Delay(.5)
+				.Delay(1.5)
 				// and close the product tour offer
 				.ClickByName("Cancel Wizard Button");
 
-			//testRunner.Delay(1);
+			testRunner.Delay(1);
 			// If testing is to be reliable, that dialog really shouldn't be showing now.
 			// NOTE: This may fail rarely still. Happened once with OrthographicZoomToSelectionWide.
 			Assert.IsFalse(testRunner.NamedWidgetExists("Cancel Wizard Button"));
@@ -822,8 +822,14 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 		public static AutomationRunner NavigateToLibraryHome(this AutomationRunner testRunner)
 		{
-			return testRunner.EnsureContentMenuOpen()
-				.ClickByName("Bread Crumb Button Home")
+			testRunner.EnsureContentMenuOpen();
+            while (!testRunner.NameExists("Bread Crumb Button Home", .2))
+            {
+                testRunner.ClickByName("Library Up Button")
+                    .Delay();
+            }
+
+			return testRunner.ClickByName("Bread Crumb Button Home")
 				.Delay(.5);
 		}