Index: firmware/App/Controllers/Buttons.c
===================================================================
diff -u -r22dc8daefbb24bd2a2ea6f0a2465c6714267638c -r7ceb29cfd33a5fb5e29013226d2a180b6fba9938
--- firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 22dc8daefbb24bd2a2ea6f0a2465c6714267638c)
+++ firmware/App/Controllers/Buttons.c	(.../Buttons.c)	(revision 7ceb29cfd33a5fb5e29013226d2a180b6fba9938)
@@ -300,8 +300,7 @@
                     POWER_OFF_WARNING_DATA_T data;
 
                     data.powerOffWarning = 0;
-
-                    //broadcastData( MSG_ID_POWER_OFF_WARNING, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)0, 0 );
+
                     broadcastData( MSG_ID_POWER_OFF_WARNING, COMM_BUFFER_OUT_CAN_HD_BROADCAST, (U08*)&data, sizeof( POWER_OFF_WARNING_DATA_T ) );
                     signalPowerOffWarning();
                     offButtonPressPending = TRUE;
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r8b22e495cc6058d348058ce34dc799448f32808a -r7ceb29cfd33a5fb5e29013226d2a180b6fba9938
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 8b22e495cc6058d348058ce34dc799448f32808a)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 7ceb29cfd33a5fb5e29013226d2a180b6fba9938)
@@ -408,7 +408,15 @@
     }
     else
     {
-        activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+        if ( STATE_OPEN == frontDoor )
+        {
+            activateAlarmNoData( ALARM_ID_CARTRIDGE_DOOR_OPENED );
+        }
+
+        if ( STATE_OPEN == pumpTrack )
+        {
+            activateAlarmNoData( ALARM_ID_PUMP_TRACK_LATCH_OPENED );
+        }
     }
 
     return state;
@@ -467,6 +475,10 @@
     {
         activateAlarmNoData( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
     }
+    else
+    {
+        clearAlarmCondition( ALARM_ID_CARTRIDGE_REMOVAL_FAILURE );
+    }
 
     if ( TRUE == isSyringeDetected() )
     {
@@ -477,6 +489,10 @@
             activateAlarmNoData( ALARM_ID_HD_SYRINGE_DETECTED );
         }
     }
+    else
+    {
+        clearAlarmCondition( ALARM_ID_HD_SYRINGE_DETECTED );
+    }
 
     // Wait for cartridge and syringe to be removed and for DG to finish any drains/fills.
     if ( ( TRUE == isCartridgeRemoved ) && ( FALSE == isSyringeDetected() ) )