diff --git a/resources/definitions/longer_base.def.json b/resources/definitions/longer_base.def.json
index 08e2818801..e69b871e7d 100644
--- a/resources/definitions/longer_base.def.json
+++ b/resources/definitions/longer_base.def.json
@@ -121,7 +121,7 @@
     "overrides": {
         "machine_name": { "default_value": "LONGER Base Printer" },
         "machine_start_gcode": { "default_value": "; LONGER Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" },
-        "machine_end_gcode": { "default_value": "; LONGER End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
+        "machine_end_gcode": { "default_value": "; LONGER End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\nM84 X Y E ;Disable all steppers but Z\n" },
 
         "machine_max_feedrate_x": { "value": 500 },
         "machine_max_feedrate_y": { "value": 500 },
@@ -204,13 +204,11 @@
         },
         "retraction_retract_speed": {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200,
-            "default_value": 45 
+            "maximum_value": 200
         },
         "retraction_prime_speed": {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
-            "maximum_value": 200,
-            "default_value": 45
+            "maximum_value": 200
         },
         
         "retraction_hop_enabled": { "value": "False" },
diff --git a/resources/definitions/longer_cube2.def.json b/resources/definitions/longer_cube2.def.json
index 53d8b74598..661c493e8c 100644
--- a/resources/definitions/longer_cube2.def.json
+++ b/resources/definitions/longer_cube2.def.json
@@ -11,6 +11,10 @@
     "overrides": {
         "machine_name": { "default_value": "LONGER Cube2" },
         "machine_start_gcode": { "default_value": "; LONGER Cube2 Start G-code\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y120.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y120.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" },
+        "machine_end_gcode": { "default_value": "; LONGER Cube2 End G-code\nG91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\nG1 X0 Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM84 X Y E ;Disable all steppers but Z\n" },
+
+        "machine_heated_bed": { "default_value": false },
+        
         "machine_width": { "default_value": 120 },
         "machine_depth": { "default_value": 140 },
         "machine_height": { "default_value": 105 },