diff --git a/StaticData/Materials/3DXTech/ezPC.material b/StaticData/Materials/3DXTech/ezPC.material
index e07110e04..37543ad73 100644
--- a/StaticData/Materials/3DXTech/ezPC.material
+++ b/StaticData/Materials/3DXTech/ezPC.material
@@ -8,7 +8,6 @@
       "layer_id": "d9240109-d750-462a-9d72-4c4f53678710",
       "bed_temperature": "115",
       "enable_fan": "0",
-      "has_fan": "False",
       "infill_speed": "30",
       "max_fan_speed": "0",
       "min_fan_speed": "0",
diff --git a/StaticData/Materials/General/PC.material b/StaticData/Materials/General/PC.material
index 163ab95db..80c266546 100644
--- a/StaticData/Materials/General/PC.material
+++ b/StaticData/Materials/General/PC.material
@@ -5,7 +5,7 @@
   "MaterialLayers": [
     {
       "layer_name": "Polycarbonate",
-      "layer_id": "d9240109-d750-462a-9d72-4c4f53678710",
+      "layer_id": "d924b109-d750-4a2a-9d72-4c4f53178710",
       "bed_temperature": "115",
       "enable_fan": "0",
       "has_fan": "False",
@@ -21,6 +21,7 @@
       "bed_temperature_pei": "100",
       "bed_temperature_pp": "100",
       "top_solid_infill_speed": "22",
+      "material_sku": "PC"
     }
   ],
   "OemLayer": null,
diff --git a/StaticData/Materials/General/TPU.material b/StaticData/Materials/General/TPU.material
index 3aaf9996e..238a01fb3 100644
--- a/StaticData/Materials/General/TPU.material
+++ b/StaticData/Materials/General/TPU.material
@@ -6,7 +6,7 @@
     {
       "layer_name": "TPU",
       "filament_density": "1.23",
-      "layer_id": "80257dda-abc1-4837-be45-54910ce1071d",
+      "layer_id": "80357dda-abc1-4837-be45-54912ce1071d",
       "first_layer_speed": "15",
       "filament_cost": "24.64",
       "infill_speed": "25",
@@ -26,6 +26,7 @@
       "bed_temperature_kapton": "65",
       "bed_temperature_pei": "55",
       "min_fan_speed": "0",
+      "material_sku": "TPU"
     }
   ],
   "OemLayer": null,
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index a6816b76f..068334475 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit a6816b76febf66e9c9aca2d30af8ef698ba2893f
+Subproject commit 0683344758e8784f1ce10fb51b34dcf0a1c3c158
diff --git a/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs b/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs
index f14369f53..46eeace1a 100644
--- a/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs
+++ b/Tests/MatterControl.Tests/MatterControl/OemProfileTests.cs
@@ -193,13 +193,14 @@ M300 S3000 P30   ; Resume Tone";
 
 			var allMaterialIds = new HashSet<string>();
 
-			foreach(var profile in profiles)
+			for(var i = 0; i < profiles.Count; i++)
             {
+				var profile = profiles[i];
 				Assert.AreEqual(1, profile.MaterialLayers.Count, "Each material profile should have 1 material in it");
 				var material = profile.MaterialLayers[0];
 				profile.ActiveMaterialKey = material.LayerID;
-				Assert.IsTrue(!string.IsNullOrEmpty(profile.GetValue(SettingsKey.material_sku)));
-				Assert.IsTrue(!allMaterialIds.Contains(material.LayerID), "Every material needs a unique Id");
+				Assert.IsTrue(!string.IsNullOrEmpty(profile.GetValue(SettingsKey.material_sku)), $"All profiles should have a material_sku set {files[i].FullName}");
+				Assert.IsTrue(!allMaterialIds.Contains(material.LayerID), $"Every material needs a unique Id {files[i].FullName}");
 				allMaterialIds.Add(material.LayerID);
 			}
 		}