diff --git a/config/model_menu.conf b/config/model_menu.conf
index 24fe3bd8..aca36403 100644
--- a/config/model_menu.conf
+++ b/config/model_menu.conf
@@ -1,4 +1,6 @@
 CreatBot_F430NX
 CreatBot_D600Pro2
+CreatBot_D600Pro2_V0
 CreatBot_D1000
+CreatBot_D1000_V0
 CreatBot_P800
diff --git a/panels/advanced.py b/panels/advanced.py
index 903a9c02..adbe4216 100644
--- a/panels/advanced.py
+++ b/panels/advanced.py
@@ -15,7 +15,7 @@ class Panel(ScreenPanel):
         self.advanced_options = [
             {"adaptive_leveling": {"section": "main", "name": _("Adaptive Bed Leveling"), "type": "binary",
                                "tooltip": _("Leveling Only in the Actual Print Area"),
-                               "value": "True", "callback": self.set_adaptive_leveling}},
+                               "value": "False", "callback": self.set_adaptive_leveling}},
             {"power_loss_recovery": {"section": "main", "name": _("Power Loss Recovery"), "type": "binary",
                                "tooltip": _("Restores your print job after a power outage"),
                                "value": "True", "callback": self.set_power_loss_recovery}},
@@ -50,5 +50,8 @@ class Panel(ScreenPanel):
             variables = data['save_variables']['variables']
             if 'adaptive_meshing' in variables:
                 self.menu_list['adaptive_leveling'].set_active(variables['adaptive_meshing'])
+            else:
+                self.menu_list["adaptive_leveling"].set_active(False)
+
             if 'power_loss_recovery' in variables:
                 self.menu_list['power_loss_recovery'].set_active(variables['power_loss_recovery'])
diff --git a/panels/job_status.py b/panels/job_status.py
index 515afa6a..b325db48 100644
--- a/panels/job_status.py
+++ b/panels/job_status.py
@@ -739,9 +739,10 @@ class Panel(ScreenPanel):
             self.enable_button("resume", "cancel")
             self.can_close = False
         else:
+            active_extruder = self._printer.get_stat("toolhead", "extruder")
             offset = self._printer.get_stat("gcode_move", "homing_origin")
             self.zoffset = float(offset[2]) if offset else 0
-            if self.zoffset != 0:
+            if self.zoffset != 0 and active_extruder == "extruder":
                 if "Z_OFFSET_APPLY_ENDSTOP" in self._printer.available_commands:
                     self.buttons['button_grid'].attach(self.buttons["save_offset_endstop"], 0, 0, 1, 1)
                 else: