Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r39c83612c7d83075cded8b7e1c8030898cdb5ad9 -rb77808c306061c4ee874ddb6608a7da803d26ee4
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 39c83612c7d83075cded8b7e1c8030898cdb5ad9)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision b77808c306061c4ee874ddb6608a7da803d26ee4)
@@ -56,7 +56,6 @@
 
 // RO filter cool down defines
 #define ROF_ACTIVE_COOL_TARGET_FLOW_LPM                 0.3F                                                        ///< RO active cool down target flow in L/min.
-#define ROF_ACTIVE_COOL_MAX_ALLOWED_PRESSURE_PSI        30                                                          ///< RO active cool down maximum pressure in psi.
 #define ROF_ACTIVE_COOL_TARGET_RSRVR_FILL_ML            600.0F                                                      ///< RO active cool target reservoir fill in mL.
 #define ROF_ACTIVE_COOL_TARGET_TEMP_C                   40.0F                                                       ///< RO active cool target temperature in C.
 #define ROF_ACTIVE_COOL_BELOW_TEMP_TIMEOUT_MS           ( 30 * MS_PER_SECOND )                                      ///< RO active cool temperature below target for cooling timeout in milliseconds.
@@ -177,7 +176,7 @@
     deenergizeActuators( NO_PARK_CONC_PUMPS );
 
     initHeatDisinfectActiveCoolMode();
-    setCurrentSubState( NO_SUB_STATE );
+    setCurrentSubState( heatDisinfectActiveCoolState );
     setCPLDCleanLEDColor( CPLD_CLEAN_LED_ORANGE );
 
     return heatDisinfectActiveCoolState;
@@ -771,7 +770,7 @@
             // Set the variables to fail and go to cancel water path. Set the pending alarm to no alarm so the cancel water path
             // will not be raising the alarm at end of the cancel water path. The recoverable alarm is raised here in this function
             heatDisinfectActiceCoolPrevState = heatDisinfectActiveCoolState;
-            heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_BASIC_PATH_STATE;
+            heatDisinfectActiveCoolState     = DG_HEAT_DISINFECT_ACTIVE_COOL_CANCEL_WATER_PATH_STATE;
             alarmDetectedPendingTrigger      = ALARM_ID_DG_DIALYSATE_CAP_NOT_IN_PROPER_POSITION;
 
             if ( STATE_OPEN == getSwitchStatus( CONCENTRATE_CAP ) )
@@ -887,7 +886,7 @@
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
             // RO pump
-            setROPumpTargetFlowRateLPM( ROF_ACTIVE_COOL_TARGET_FLOW_LPM, ROF_ACTIVE_COOL_MAX_ALLOWED_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( ROF_ACTIVE_COOL_TARGET_FLOW_LPM, CLEANING_MODE_HIGH_TEMP_MAX_RO_PRESSURE_PSI );
             // Drain pump
             signalDrainPumpHardStop();
             break;
@@ -915,7 +914,7 @@
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
             // RO pump
-            setROPumpTargetFlowRateLPM( ROF_ACTIVE_COOL_TARGET_FLOW_LPM, ROF_ACTIVE_COOL_MAX_ALLOWED_PRESSURE_PSI );
+            setROPumpTargetFlowRateLPM( ROF_ACTIVE_COOL_TARGET_FLOW_LPM, CLEANING_MODE_HIGH_TEMP_MAX_RO_PRESSURE_PSI );
             // Drain pump
             signalDrainPumpHardStop();
             break;