Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r9b8889b096ae02246e939468fc843f467de8c6bb -rf502a589b7a6c39c6fd57ceee778f5c94481af14
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 9b8889b096ae02246e939468fc843f467de8c6bb)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision f502a589b7a6c39c6fd57ceee778f5c94481af14)
@@ -44,9 +44,9 @@
 // ********** private data **********
 
 #define HEAT_DISINFECT_ACTIVE_COOL_DATA_PUB_INTERVAL    ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                   ///< Mode heat disinfect active cool data publish interval in counts.
-#define ACID_PUMP_SPEED_ML_PER_MIN                      30.6F                                                       ///< Acid concentrate pump speed in mL/min.
+#define ACID_PUMP_SPEED_ML_PER_MIN                      -30.0F                                                      ///< Acid concentrate pump speed in mL/min.
 // The acid pump is 2% faster than the acid pump to create a flow from acid to bicarb line during heat disinfect
-#define BICARB_PUMP_SPEED_ML_PER_MIN                    -30.0F                                                      ///< Bicarb concentrate pump speed in mL/min.
+#define BICARB_PUMP_SPEED_ML_PER_MIN                    30.6F                                                       ///< Bicarb concentrate pump speed in mL/min.
 #define RSRVR_FILL_TIMEOUT_MS                           ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoir fill timeout in milliseconds.
 #define RSRVR_DRAIN_TIMEOUT_MS                          ( 2 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Reservoir drain timeout in milliseconds.
 #define RSRVR_DRAIN_STEADY_TIMEOUT_MS                   ( 6 * MS_PER_SECOND )                                       ///< Reservoir drain steady timeout in milliseconds.
@@ -176,7 +176,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectActiveCoolMode();
-    setCurrentSubState( heatDisinfectActiveCoolState );
+    setCurrentSubState( NO_SUB_STATE );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectActiveCoolState;
@@ -715,13 +715,16 @@
  *************************************************************************/
 static void failHeatDisinfectActiveCool( void )
 {
+    // If a fault alarm is active go to mode fault otherwise for cleaning mode alarms, transition to standby
+    DG_OP_MODE_T nextOpMode = ( FALSE == isDGFaultAlarmActive() ? DG_MODE_STAN : DG_MODE_FAUL );
+
     // In the cleaning modes the alarms are triggered but the mode is not transitioned to fault automatically
     // so transition to fault mode is done here
     if ( alarmDetectedPendingTrigger != ALARM_ID_NO_ALARM )
     {
         SET_ALARM_WITH_1_U32_DATA( alarmDetectedPendingTrigger, heatDisinfectActiceCoolPrevState )
     }
-    requestNewOperationMode( DG_MODE_STAN );
+    requestNewOperationMode( nextOpMode );
 }
 
 /*********************************************************************//**
@@ -900,7 +903,7 @@
             setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
-            setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+            setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRD1, VALVE_STATE_CLOSED );
             setValveState( VRD2, VALVE_STATE_CLOSED );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
@@ -935,7 +938,7 @@
             setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
             // UV reactors
             turnOnUVReactor( INLET_UV_REACTOR );
-            turnOnUVReactor( OUTLET_UV_REACTOR );
+            turnOffUVReactor( OUTLET_UV_REACTOR );
             // Concentrate pumps
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
@@ -963,7 +966,7 @@
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             // UV reactors
             turnOnUVReactor( INLET_UV_REACTOR );
-            turnOnUVReactor( OUTLET_UV_REACTOR );
+            turnOffUVReactor( OUTLET_UV_REACTOR );
             // Concentrate pumps
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, ACID_PUMP_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );