diff --git a/resources/machines/ultimaker2plus.json b/resources/machines/ultimaker2plus.json
index c1c581618f..0a344d4aa6 100644
--- a/resources/machines/ultimaker2plus.json
+++ b/resources/machines/ultimaker2plus.json
@@ -12,6 +12,7 @@
 
     "overrides": {
         "speed_infill": { "inherit_function": "speed_print"  },
+        "speed_wall_x": { "inherit_function": "speed_wall"  },
         "layer_height_0": { "inherit_function": "round(machine_nozzle_size / 1.5, 2)"  },
         "retraction_min_travel": { "inherit_function": "machine_nozzle_size * 2"  },
         "line_width": { "inherit_function": "round(machine_nozzle_size * 0.875, 2)"  },
diff --git a/resources/machines/ultimaker2plus_025.json b/resources/machines/ultimaker2plus_025.json
index d3aea61e86..2c022f8448 100644
--- a/resources/machines/ultimaker2plus_025.json
+++ b/resources/machines/ultimaker2plus_025.json
@@ -12,10 +12,9 @@
     "variant": "0.25 mm",
 
     "overrides": {
-        "speed_wall": { "inherit_function": "round(speed_print / 1.2, 0)"  },
-        "speed_wall_x": { "inherit_function": "speed_wall"  },
-        "speed_wall_0": { "inherit_function": "speed_wall - 5"  },
-        "speed_topbottom": { "inherit_function": "round(speed_print / 1.5, 0)" },
+        "speed_wall": { "inherit_function": "round(speed_print / 1.2, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 5 else (speed_wall - 5)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 1.5, 1)" },
         "machine_nozzle_size": { "default": 0.25 },
         "machine_nozzle_tip_outer_diameter": { "default": 0.8 },
         "coasting_volume": { "default": 0.1 },
diff --git a/resources/machines/ultimaker2plus_040.json b/resources/machines/ultimaker2plus_040.json
index ce7f8514fc..f5a0f5a710 100644
--- a/resources/machines/ultimaker2plus_040.json
+++ b/resources/machines/ultimaker2plus_040.json
@@ -12,10 +12,9 @@
     "variant": "0.4 mm",
 
     "overrides": {
-        "speed_wall": { "inherit_function": "round(speed_print / 1.25, 0)"  },
-        "speed_wall_x": { "inherit_function": "speed_wall"  },
-        "speed_wall_0": { "inherit_function": "speed_wall - 10"  },
-        "speed_topbottom": { "inherit_function": "round(speed_print / 2.25, 0)" },
+        "speed_wall": { "inherit_function": "round(speed_print / 1.25, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 10 else (speed_wall - 10)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2.25, 1)" },
         "machine_nozzle_size": { "default": 0.40 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.05 }
     }
diff --git a/resources/machines/ultimaker2plus_060.json b/resources/machines/ultimaker2plus_060.json
index a167907d9c..89538f2fd0 100644
--- a/resources/machines/ultimaker2plus_060.json
+++ b/resources/machines/ultimaker2plus_060.json
@@ -12,10 +12,9 @@
     "variant": "0.6 mm",
 
     "overrides": {
-        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 0)"  },
-        "speed_wall_x": { "inherit_function": "speed_wall"  },
-        "speed_wall_0": { "inherit_function": "speed_wall - 10"  },
-        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 0)" },
+        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 10 else (speed_wall - 10)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 1)" },
         "machine_nozzle_size": { "default": 0.60 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.25 },
         "coasting_volume": { "default": 1.36 }
diff --git a/resources/machines/ultimaker2plus_080.json b/resources/machines/ultimaker2plus_080.json
index b39da3f46b..e231fbb9f5 100644
--- a/resources/machines/ultimaker2plus_080.json
+++ b/resources/machines/ultimaker2plus_080.json
@@ -12,10 +12,9 @@
     "variant": "0.8 mm",
 
     "overrides": {
-        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 0)"  },
-        "speed_wall_x": { "inherit_function": "speed_wall"  },
-        "speed_wall_0": { "inherit_function": "speed_wall - 10"  },
-        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 0)" },
+        "speed_wall": { "inherit_function": "round(speed_print / 1.333333, 1)"  },
+        "speed_wall_0": { "inherit_function": "1 if speed_wall < 10 else (speed_wall - 10)"  },
+        "speed_topbottom": { "inherit_function": "round(speed_print / 2, 1)" },
         "machine_nozzle_size": { "default": 0.80 },
         "machine_nozzle_tip_outer_diameter": { "default": 1.35 },
         "coasting_volume": { "default": 3.22 }