Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r6743b1ba8056267f3a1669a3773c9f9995c0a788 -r8ae4fbcd07215613d418e63a54d2a6fa80a83a4a
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 6743b1ba8056267f3a1669a3773c9f9995c0a788)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 8ae4fbcd07215613d418e63a54d2a6fa80a83a4a)
@@ -203,6 +203,9 @@
                             NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_ACID_CONCENTRATE_INVALID_CAL_RECORD );
         getNVRecord2Driver( GET_CAL_BICARB_CONCENTRATES, (U08*)&bicarbConcentrateCalRecord, sizeof( bicarbConcentrateCalRecord ),
                             NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
+
+        getNVRecord2Driver( GET_CAL_CONCENTRATE_PUMPS_RECORD, (U08*)&concentratePumpsCalRecord, sizeof( DG_CONC_PUMPS_CAL_RECORD_T ),
+                            NUM_OF_CAL_DATA_DG_CONC_PUMPS, ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD );
     }
 
     // Calculate pump speed for each defined pump
@@ -351,7 +354,7 @@
                                      NUMBER_OF_ACID_AND_BICARB_NV_DATA_TO_CHECK, ALARM_ID_DG_BICARB_CONCENTRATE_INVALID_CAL_RECORD );
 
     calStatus |= getNVRecord2Driver( GET_CAL_CONCENTRATE_PUMPS_RECORD, (U08*)&concentratePumpsCalRecord, sizeof( DG_CONC_PUMPS_CAL_RECORD_T ),
-                                     NUM_OF_CAL_DATA_DG_CONC_PUMPS, ALARM_ID_NO_ALARM );
+                                     NUM_OF_CAL_DATA_DG_CONC_PUMPS, ALARM_ID_DG_CONCENTRATE_PUMPS_INVALID_CAL_RECORD );
 
     result = ( TRUE == calStatus ? SELF_TEST_STATUS_PASSED : SELF_TEST_STATUS_FAILED );
 
Index: firmware/App/Modes/ModeHeatDisinfectActiveCool.c
===================================================================
diff -u -r54abf84364e737dd350153d5fab7dd652f917ef4 -r8ae4fbcd07215613d418e63a54d2a6fa80a83a4a
--- firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 54abf84364e737dd350153d5fab7dd652f917ef4)
+++ firmware/App/Modes/ModeHeatDisinfectActiveCool.c	(.../ModeHeatDisinfectActiveCool.c)	(revision 8ae4fbcd07215613d418e63a54d2a6fa80a83a4a)
@@ -1309,8 +1309,9 @@
                 rsrvrsStatus.rsrvr[ DG_RESERVOIR_1 ].rStatus = DG_RESERVOIR_ABOVE_TARGET;
                 state                                        = DG_HEAT_DISINFECT_ACTIVE_COOL_DRAIN_R1_STATE;
             }
+            setHeatDisinfectActiveCoolActuators( state );
         }
-        setHeatDisinfectActiveCoolActuators( state );
+
     }
 
     state = checkRsrvrMgmtTimeoutStatus( rsrvrID, state );
Index: firmware/App/Services/PIControllers.c
===================================================================
diff -u -r6743b1ba8056267f3a1669a3773c9f9995c0a788 -r8ae4fbcd07215613d418e63a54d2a6fa80a83a4a
--- firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 6743b1ba8056267f3a1669a3773c9f9995c0a788)
+++ firmware/App/Services/PIControllers.c	(.../PIControllers.c)	(revision 8ae4fbcd07215613d418e63a54d2a6fa80a83a4a)
@@ -209,12 +209,6 @@
         controller->controlSignal += ( controller->Kp * controller->errorSignal );
         controller->controlSignal = RANGE( controller->controlSignal, controller->uMin, controller->uMax );
 
-        if ( ( PI_CONTROLLER_ID_RO_PUMP_FLOW == controllerID ) || ( PI_CONTROLLER_ID_RO_PUMP_MAX_PRES == controllerID ) )
-        {
-            SEND_EVENT_WITH_2_F32_DATA( DG_EVENT_PI_CONTROL_1, controller->errorSignal, controller->errorSum )
-            SEND_EVENT_WITH_2_F32_DATA( DG_EVENT_PI_CONTROL_2, controlSignalBeforeWindup, controller->controlSignal )
-        }
-
         result = controller->controlSignal;
     }
     else
@@ -289,6 +283,7 @@
 
     return output;
 }
+
 /*********************************************************************//**
  * @brief
  * The getPIControllerSignals function returns the latest requested signal sample.