diff --git a/drivers/RP2040/driver.c b/drivers/RP2040/driver.c
index afd501e2..f6926b13 100644
--- a/drivers/RP2040/driver.c
+++ b/drivers/RP2040/driver.c
@@ -508,7 +508,7 @@ static void spindle_set_speed (uint_fast16_t pwm_value)
 {
     if (pwm_value == spindle_pwm.off_value) {
         pwmEnabled = false;
-        if(settings.spindle.disable_with_zero_speed)
+        if(settings.spindle.flags.pwm_action == SpindleAction_DisableWithZeroSPeed)
             spindle_off();
         if(spindle_pwm.always_on) {
 //            SPINDLE_PWM_TIMER->CCR1 = spindle_pwm.off_value;
@@ -1133,7 +1133,7 @@ bool driver_init (void)
   // driver capabilities, used for announcing and negotiating (with Grbl) driver functionality
 
 #ifdef CONTROL_SAFETY_DOOR_PIN
-    hal.driver_cap.safety_door = On;
+    hal.signals_cap.safety_door_ajar = On;
 #endif
     hal.driver_cap.spindle_dir = On;
 #ifdef SPINDLE_PWM_PIN
diff --git a/drivers/RP2040/serial.c b/drivers/RP2040/serial.c
index d9d0d12b..cc5d70d8 100644
--- a/drivers/RP2040/serial.c
+++ b/drivers/RP2040/serial.c
@@ -128,17 +128,17 @@ bool serialPutC (const char c)
         return true;
     }
 
-    next_head = (txbuffer.head + 1) & (TX_BUFFER_SIZE - 1);     // Get and update head pointer
+    next_head = (txbuffer.head + 1) & (TX_BUFFER_SIZE - 1); // Get and update head pointer
 
-    while(txbuffer.tail == next_head) {                         // Buffer full, block until space is available...
+    while(txbuffer.tail == next_head) {                     // Buffer full, block until space is available...
         if(!hal.stream_blocking_callback())
             return false;
     }
 
-    txbuffer.data[txbuffer.head] = c;                           // Add data to buffer
-    txbuffer.head = next_head;                                  // and update head pointer
+    txbuffer.data[txbuffer.head] = c;                       // Add data to buffer
+    txbuffer.head = next_head;                              // and update head pointer
 
-    hw_set_bits(UART->imsc, UART_UARTIMSC_TXIM_BITS);
+    hw_set_bits(UART->imsc, UART_UARTIMSC_TXIM_BITS);       // Enable transmit interrupt      
 
     return true;
 }