diff --git a/Program.cs b/Program.cs
index 989b66537..b577dc99e 100644
--- a/Program.cs
+++ b/Program.cs
@@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl
 			Thread.CurrentThread.CurrentUICulture = CultureInfo.InvariantCulture;
 
 			// Set default Agg providers
-			AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider`1[[MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32]], agg_platform_win32";
+			AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.OpenGLWinformsWindowProvider, agg_platform_win32";
 			//AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.MatterControl.WinformsSingleWindowProvider, MatterControl.Winforms";
 
 			string userProfilePath = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index 6a62ba100..234526f77 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit 6a62ba1001867dc8b69c20f51476bd6cd8cce6c8
+Subproject commit 234526f77d66ca80ee36266771b819eef1341bc5
diff --git a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
index 82b79b8fa..61fc0bd00 100644
--- a/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
+++ b/Tests/MatterControl.AutomationTests/HardwareLevelingUITests.cs
@@ -86,7 +86,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 
 					for (int i = 0; i < 3; i++)
 					{
-						var section = i * 3 + 1;
+						var section = (i * 3) + 1;
 
 						waitForPage($"Step {section} of 9");
 						testRunner.ClickByName("Move Z positive");
diff --git a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
index c3cab4523..13d49d386 100644
--- a/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
+++ b/Tests/MatterControl.Tests/MatterControl/MatterControlUtilities.cs
@@ -625,7 +625,7 @@ namespace MatterHackers.MatterControl.Tests.Automation
 			Environment.CurrentDirectory = TestContext.CurrentContext.ResolveProjectPath(5, "MatterControl", "bin", outputDirectory);
 
 			// Override the default SystemWindow type without config.json
-			AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.WinformsSystemWindowProvider`1[[MatterHackers.Agg.UI.OpenGLSystemWindow, agg_platform_win32]], agg_platform_win32";
+			AggContext.Config.ProviderTypes.SystemWindowProvider = "MatterHackers.Agg.UI.OpenGLWinformsWindowProvider, agg_platform_win32";
 
 #if !__ANDROID__
 			// Set the static data to point to the directory of MatterControl