diff --git a/Marlin/src/feature/bltouch.cpp b/Marlin/src/feature/bltouch.cpp
index d3348e79f0..b1cc30bee0 100644
--- a/Marlin/src/feature/bltouch.cpp
+++ b/Marlin/src/feature/bltouch.cpp
@@ -68,13 +68,15 @@ void BLTouch::init(const bool set_voltage/*=false*/) {
 
   #else
 
-    if (DEBUGGING(LEVELING)) {
-      PGMSTR(mode0, "OD");
-      PGMSTR(mode1, "5V");
-      DEBUG_ECHOPGM("BLTouch Mode: ");
-      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
-      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
-    }
+    #ifdef DEBUG_OUT
+      if (DEBUGGING(LEVELING)) {
+        PGMSTR(mode0, "OD");
+        PGMSTR(mode1, "5V");
+        DEBUG_ECHOPGM("BLTouch Mode: ");
+        DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+        DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
+      }
+    #endif
 
     const bool should_set = od_5v_mode != ENABLED(BLTOUCH_SET_5V_MODE);
 
diff --git a/Marlin/src/lcd/menu/menu_bed_corners.cpp b/Marlin/src/lcd/menu/menu_bed_corners.cpp
index 5740978639..38a074eb01 100644
--- a/Marlin/src/lcd/menu/menu_bed_corners.cpp
+++ b/Marlin/src/lcd/menu/menu_bed_corners.cpp
@@ -292,7 +292,7 @@ static void _lcd_level_bed_corners_get_next_position() {
     } while (good_points < nr_edge_points); // loop until all points within tolerance
 
     #if ENABLED(BLTOUCH)
-      if (bltouch.high_speed_mode)
+      if (bltouch.high_speed_mode) {
         // In HIGH SPEED MODE do clearance and stow at the very end
         do_blocking_move_to_z(current_position.z + LEVEL_CORNERS_Z_HOP);
         bltouch.stow();
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
index 19b3dcbafb..4cd43e787a 100644
--- a/Marlin/src/lcd/menu/menu_configuration.cpp
+++ b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -53,6 +53,8 @@
   #include "../../libs/buzzer.h"
 #endif
 
+#include "../../core/debug_out.h"
+
 #define HAS_DEBUG_MENU ENABLED(LCD_PROGRESS_BAR_TEST)
 
 void menu_advanced_settings();
@@ -219,9 +221,9 @@ void menu_advanced_settings();
     void bltouch_report() {
       PGMSTR(mode0, "OD");
       PGMSTR(mode1, "5V");
-      SERIAL_ECHOPGM("BLTouch Mode: ");
-      SERIAL_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
-      SERIAL_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
+      DEBUG_ECHOPGM("BLTouch Mode: ");
+      DEBUG_ECHOPGM_P(bltouch.od_5v_mode ? mode1 : mode0);
+      DEBUG_ECHOLNPGM(" (Default " TERN(BLTOUCH_SET_5V_MODE, "5V", "OD") ")");
       char mess[21];
       strcpy_P(mess, PSTR("BLTouch Mode: "));
       strcpy_P(&mess[15], bltouch.od_5v_mode ? mode1 : mode0);
diff --git a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
index 197ece5dfd..34bf77be27 100755
--- a/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
+++ b/buildroot/tests/BIGTREE_GTR_V1_0_usb_flash_drive
@@ -10,8 +10,8 @@ restore_configs
 opt_set MOTHERBOARD BOARD_BTT_GTR_V1_0 SERIAL_PORT 3 \
         EXTRUDERS 8 TEMP_SENSOR_1 1 TEMP_SENSOR_2 1 TEMP_SENSOR_3 1 TEMP_SENSOR_4 1 TEMP_SENSOR_5 1 TEMP_SENSOR_6 1 TEMP_SENSOR_7 1
 opt_enable SDSUPPORT USB_FLASH_DRIVE_SUPPORT USE_OTG_USB_HOST \
-           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH NEOPIXEL_LED Z_SAFE_HOMING \
-           FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
+           REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER BLTOUCH LEVEL_BED_CORNERS LEVEL_CORNERS_USE_PROBE \
+           NEOPIXEL_LED Z_SAFE_HOMING FILAMENT_RUNOUT_SENSOR NOZZLE_PARK_FEATURE ADVANCED_PAUSE_FEATURE
 # Not necessary to enable auto-fan for all extruders to hit problematic code paths
 opt_set E0_AUTO_FAN_PIN PC10 E1_AUTO_FAN_PIN PC11 E2_AUTO_FAN_PIN PC12 NEOPIXEL_PIN PF13 \
         X_DRIVER_TYPE TMC2208 Y_DRIVER_TYPE TMC2130 \