diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h
index 35cfe651d..a44346619 100755
--- a/Firmware/Marlin.h
+++ b/Firmware/Marlin.h
@@ -173,14 +173,14 @@ void manage_inactivity(bool ignore_stepper_queue=false);
 #endif
 
 #ifdef PSU_Delta
-void init_force_z();
-void check_force_z();
-#undef disable_z()
-#define disable_z() disable_force_z()
-void disable_force_z();
-#undef enable_disable_z()
-#define enable_z() enable_force_z()
-void enable_force_z();
+    void init_force_z();
+    void check_force_z();
+    #undef disable_z
+    #define disable_z() disable_force_z()
+    void disable_force_z();
+    #undef enable_z
+    #define enable_z() enable_force_z()
+    void enable_force_z();
 #endif // PSU_Delta
 
 
diff --git a/Firmware/tmc2130.cpp b/Firmware/tmc2130.cpp
index f9dee3be9..15188fc42 100755
--- a/Firmware/tmc2130.cpp
+++ b/Firmware/tmc2130.cpp
@@ -142,8 +142,11 @@ uint16_t __tcoolthrs(uint8_t axis)
 	}
 	return 0;
 }
-
-void tmc2130_init(bool bSupressFlag=false)
+#ifdef PSU_Delta
+void tmc2130_init(bool bSupressFlag)
+#else
+void tmc2130_init()
+#endif
 {
 //	DBG(_n("tmc2130_init(), mode=%S\n"), tmc2130_mode?_n("STEALTH"):_n("NORMAL"));
 	WRITE(X_TMC2130_CS, HIGH);
diff --git a/Firmware/tmc2130.h b/Firmware/tmc2130.h
index a1d160f05..ed4c0d7c0 100644
--- a/Firmware/tmc2130.h
+++ b/Firmware/tmc2130.h
@@ -51,7 +51,11 @@ typedef struct
 extern tmc2130_chopper_config_t tmc2130_chopper_config[4];
 
 //initialize tmc2130
+#ifdef PSU_Delta
 extern void tmc2130_init(bool bSupressFlag=false);
+#else
+extern void tmc2130_init();
+#endif
 //check diag pins (called from stepper isr)
 extern void tmc2130_st_isr();
 //update stall guard (called from st_synchronize inside the loop)
diff --git a/Firmware/util.cpp b/Firmware/util.cpp
index b2105e929..fc6b0f0b5 100644
--- a/Firmware/util.cpp
+++ b/Firmware/util.cpp
@@ -393,6 +393,9 @@ switch(oCheckMode)
           lcd_show_fullscreen_message_and_wait_P(_i("Nozzle diameter doesn't match! Print is aborted, press the knob."));
           lcd_print_stop();
           break;
+     case ClCheckMode::_None:
+     case ClCheckMode::_Undef:
+          break;
      }
 bSettings=false;                                  // flag ('fake parameter') for 'lcd_checking_menu()' function
 menu_submenu(lcd_checking_menu);
@@ -419,6 +422,9 @@ switch(oCheckModel)
           lcd_show_fullscreen_message_and_wait_P(_i("Printer model doesn't match! Print is aborted, press the knob."));
           lcd_print_stop();
           break;
+     case ClCheckModel::_None:
+     case ClCheckModel::_Undef:
+          break;
      }
 }
 
@@ -462,6 +468,9 @@ switch(oCheckVersion)
           lcd_show_fullscreen_message_and_wait_P(_i("FW version doesn't match! Print is aborted, press the knob."));
           lcd_print_stop();
           break;
+     case ClCheckVersion::_None:
+     case ClCheckVersion::_Undef:
+          break;
      }
 }
 
@@ -488,6 +497,9 @@ switch(oCheckGcode)
           lcd_show_fullscreen_message_and_wait_P(_i("G-code level doesn't match! Print is aborted, press the knob."));
           lcd_print_stop();
           break;
+     case ClCheckGcode::_None:
+     case ClCheckGcode::_Undef:
+          break;
      }
 }
 
@@ -547,6 +559,9 @@ switch(oCheckModel)
           lcd_show_fullscreen_message_and_wait_P(_i("Printer model doesn't match! Print is aborted, press the knob."));
           lcd_print_stop();
           break;
+     case ClCheckModel::_None:
+     case ClCheckModel::_Undef:
+          break;
      }
 }