diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 798e984487..87f216296d 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1054,11 +1054,17 @@
 #define Y_BED_SIZE 400
 
 // Travel limits (mm) after homing, corresponding to endstop positions.
-#define X_MIN_POS -47
+#if ENABLED(TREX3)
+  #define X_MIN_POS -47
+  #define X_MAX_POS 460
+#else
+  #define X_MIN_POS -42
+  #define X_MAX_POS 450
+#endif
 #define Y_MIN_POS 0
 #define Z_MIN_POS 0
-#define X_MAX_POS 460
 #define Y_MAX_POS Y_BED_SIZE
+
 #if(ENABLED(tallVersion))
   #define Z_MAX_POS 700
 #else
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index ebef84d518..343508f68f 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1761,14 +1761,20 @@
   #define USER_SCRIPT_AUDIBLE_FEEDBACK
   #define USER_SCRIPT_RETURN  // Return to status screen after a script
 
-  #define USER_DESC_1 "UBL Commission 1"
-  #define USER_GCODE_1 "M502 \n M500 \n M501 \n T0 \n M190 S75 \n M106 S128 \n M104 S225 \n G28 \n G29 P1 \n G29 S1 \n M117 Run Step 2 \n"
+  #if ENABLED(TREX3)
+    #define COMMFANNSPEED " "
+  #else
+    #define COMMFANNSPEED  "M106 S128 \n"
+  #endif
+
+  #define USER_GCODE_1 "M502 \n M500 \n M501 \n T0 \n M190 S75 \n " COMMFANNSPEED "  M104 S225 \n G28 \n G29 P1 \n G29 S1 \n M117 Run Step 2 \n"
+  
 
   #define USER_DESC_2 "UBL Commission 2"
-  #define USER_GCODE_2 "G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n T0 \n M106 S128 \n M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M117 Set Z Offset \n"
+  #define USER_GCODE_2 "G29 S1 \n G29 S0 \n G29 F 10.0 \n G29 A \n M500 \n G28 \n G29 L1 \n T0 \n" COMMFANNSPEED " M109 S225 \n G1 X150 Y 150 \n G1 Z0 \n M117 Set Z Offset \n"
 
   #define USER_DESC_3 "Prep for Z Adjust"
-  #define USER_GCODE_3 "M190 75 \n T0 \n M106 S128 \n M104 225 \n G28 \n G29 L1 \n G1 X150 Y 150 \n G1 Z0 \n"
+  #define USER_GCODE_3 "M190 75 \n T0 \n " COMMFANNSPEED " M104 225 \n G28 \n G29 L1 \n G1 X150 Y 150 \n G1 Z0 \n"
 
    #define USER_DESC_4 "Fill Mesh Points"
   #define USER_GCODE_4 "G29 P3 \n G29 P3 \n G29 P3 \n G29 T \n"