Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -rff9cc57001ec23f2f27a94f944a7b73b7c554644 -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision ff9cc57001ec23f2f27a94f944a7b73b7c554644)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -361,13 +361,16 @@
  * @brief
  * The exitBloodLeakNormalState requests that the blood leak sensor to exit
  * its normal state.
- * @details Inputs: none
+ * @details Inputs: bloodLeakState
  * @details Outputs: bloodLeakExitNormalRequested
  * @return none
  *************************************************************************/
 void exitBloodLeakNormalState( void )
 {
-    bloodLeakExitNormalRequested = TRUE;
+    if ( BLOOD_LEAK_NORMAL_STATE == bloodLeakState )
+    {
+        bloodLeakExitNormalRequested = TRUE;
+    }
 }
 
 /*********************************************************************//**
Index: firmware/App/Controllers/Fans.c
===================================================================
diff -u -ra49d4033363206fc3ae86d8648eb5b9cc91e8dca -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision a49d4033363206fc3ae86d8648eb5b9cc91e8dca)
+++ firmware/App/Controllers/Fans.c	(.../Fans.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -462,7 +462,6 @@
         {
             hasAlarmBeenRaised      = FALSE;
             rpmAlarmStartTime       = 0;
-            rpmAlarmStartTimeOffset = 0;
         }
     }
 }
@@ -617,14 +616,14 @@
 
 /*********************************************************************//**
  * @brief
- * The testSetFanRPMAlarmStartTime function set the fan RPM alarm start
+ * The testSetFanRPMAlarmStartTimeOffset function set the fan RPM alarm start
  * time offset.
  * @details Inputs: none
  * @details Outputs: rpmAlarmStartTimeOffset
  * @param milliSeconds the milliSeconds the time to be offset
  * @return TRUE if override successful, FALSE if not
  *************************************************************************/
-BOOL testSetFanRPMAlarmStartTime( U32 milliSeconds )
+BOOL testSetFanRPMAlarmStartTimeOffset( U32 milliSeconds )
 {
     BOOL result = FALSE;
 
Index: firmware/App/Controllers/Fans.h
===================================================================
diff -u -r8373758a03ea82b46b4b313d2f2b24e3974a17f6 -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
+++ firmware/App/Controllers/Fans.h	(.../Fans.h)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -52,7 +52,7 @@
 
 F32  getMeasuredFanRPM( FAN_NAMES_T fan );
 
-BOOL testSetFanRPMAlarmStartTime( U32 milliSeconds );
+BOOL testSetFanRPMAlarmStartTimeOffset( U32 milliSeconds );
 
 BOOL testSetFanPublishIntervalOverride( U32 value );
 BOOL testResetFanPublishIntervalOverride( void );
Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -r0bd1acff7222327c97897b4f9ab91bcc1d9d5816 -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 0bd1acff7222327c97897b4f9ab91bcc1d9d5816)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -140,6 +140,8 @@
 
     collectTreatmentLogData();
 
+    exitBloodLeakNormalState();
+
     return currentPostTreatmentState;
 }
 
Index: firmware/App/Modes/TreatmentEnd.c
===================================================================
diff -u -r9944e4f766d9eb4cdf7a5ca7587e3ceca556e106 -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 9944e4f766d9eb4cdf7a5ca7587e3ceca556e106)
+++ firmware/App/Modes/TreatmentEnd.c	(.../TreatmentEnd.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -127,9 +127,6 @@
     // Continue air trap control
     startAirTrapControl();
 
-    // Command the blood leak to exit the normal state
-    exitBloodLeakNormalState();
-
     // Set user alarm recovery actions allowed in this sub-mode
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RESUME, TRUE );  // Resume in this sub-mode indicates resume wait for user rinseback request (not resume treatment)
     setAlarmUserActionEnabled( ALARM_USER_ACTION_RINSEBACK, TRUE );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf5e94d652d50cf8eac2fdc91948d4f5a52d6ce42 -r29b362c485f28f45ef367342ac895e1c1907ac45
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f5e94d652d50cf8eac2fdc91948d4f5a52d6ce42)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 29b362c485f28f45ef367342ac895e1c1907ac45)
@@ -6914,7 +6914,7 @@
     {
         memcpy( &rpmTimeOffset, message->payload, sizeof(U32) );
 
-        result = testSetFanRPMAlarmStartTime( rpmTimeOffset );
+        result = testSetFanRPMAlarmStartTimeOffset( rpmTimeOffset );
     }
 
     // Respond to request