diff --git a/Grbl_Esp32/src/Spindles/Laser.cpp b/Grbl_Esp32/src/Spindles/Laser.cpp
index 99df5019..718bac22 100644
--- a/Grbl_Esp32/src/Spindles/Laser.cpp
+++ b/Grbl_Esp32/src/Spindles/Laser.cpp
@@ -59,7 +59,7 @@ namespace Spindles {
         _pwm_max_value = _pwm_period;
 
         _min_rpm = 0;
-        _max_rpm = laser_full_power->get();
+        _max_rpm = _laser_full_power;
 
         _piecewise_linear = false;
 
diff --git a/Grbl_Esp32/src/Spindles/Spindle.cpp b/Grbl_Esp32/src/Spindles/Spindle.cpp
index 7db5edf2..52ce7a11 100644
--- a/Grbl_Esp32/src/Spindles/Spindle.cpp
+++ b/Grbl_Esp32/src/Spindles/Spindle.cpp
@@ -53,6 +53,8 @@ namespace Spindles {
     _10v     _10v;
 
     void Spindle::select() {
+        // TODO FIXME: I don't think we need this anymore; the factory should take care of it...
+
         switch (static_cast<SpindleType>(spindle_type->get())) {
             case SpindleType::PWM:
                 spindle = &pwm;