Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -rb8a409a6f04c2912cb20eb4c9191bff573080162 -r929a44fe491f63e6a9900227b89e3e0cd2980ed0
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision b8a409a6f04c2912cb20eb4c9191bff573080162)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 929a44fe491f63e6a9900227b89e3e0cd2980ed0)
@@ -433,9 +433,9 @@
     // If the inlet pressure is less than the threshold and TDi and TRo difference is greater than 3 C, the cycle should be canceled
     if ( ( ppiPressure < MIN_INLET_PRESSURE_PSI ) && ( fabs( THdTemp - TPoTemp ) > MAX_START_STATE_TEMP_SENSORS_DIFF_C ) )
     {
-        prevChemDisinfectState = state;
+        prevChemDisinfectState      = state;
         alarmDetectedPendingTrigger = ALARM_ID_DG_CHEM_DISINFECT_INLET_PRES_AND_TEMP_SNSRS_OUT;
-        state = DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH;
+        state                       = DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH;
     }
     else
     {
@@ -695,11 +695,8 @@
             stateTimer            = getMSTimerCount();
 
             // Set the concentrate pump to run at a constant speed during priming in reverse
-            setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, -1.0F * CONC_PUMP_PRIME_SPEED_ML_PER_MIN );
             setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP1_ACID, -1.0F * CONC_PUMP_PRIME_SPEED_ML_PER_MIN );
-
             requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
-            requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
         }
     }
 
@@ -711,7 +708,6 @@
 
         // Turn off the concentrate pumps
         requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
 
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rb8a409a6f04c2912cb20eb4c9191bff573080162 -r929a44fe491f63e6a9900227b89e3e0cd2980ed0
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision b8a409a6f04c2912cb20eb4c9191bff573080162)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 929a44fe491f63e6a9900227b89e3e0cd2980ed0)
@@ -413,7 +413,7 @@
 #ifndef DISABLE_CAP_SWITCHES
         DG_CMD_RESPONSE_T cmdResponse;
 
-        cmdResponse.commandID  = MSG_ID_DG_START_STOP_FLUSH;
+        cmdResponse.commandID  = DG_CMD_START_FLUSH;
         cmdResponse.rejected   = FALSE;
         cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
@@ -422,15 +422,15 @@
             cmdResponse.rejected   = TRUE;
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
-
-            sendCommandResponseMsg( &cmdResponse );
         }
         else
 #endif
         {
             pendingStartDGFlushRequest = TRUE;
             result                     = TRUE;
         }
+
+        sendCommandResponseMsg( &cmdResponse );
     }
 
     return result;
@@ -453,7 +453,7 @@
 #ifndef DISABLE_CAP_SWITCHES
         DG_CMD_RESPONSE_T cmdResponse;
 
-        cmdResponse.commandID  = MSG_ID_DG_START_STOP_HEAT_DISINFECT;
+        cmdResponse.commandID  = DG_CMD_START_HEAT_DISINFECT;
         cmdResponse.rejected   = FALSE;
         cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
@@ -463,14 +463,15 @@
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
 
-            sendCommandResponseMsg( &cmdResponse );
         }
         else
 #endif
         {
             pendingStartDGHeatDisinfectRequest = TRUE;
             status                             = TRUE;
         }
+
+        sendCommandResponseMsg( &cmdResponse );
     }
 
     return status;
@@ -494,7 +495,7 @@
 #ifndef DISABLE_CAP_SWITCHES
         DG_CMD_RESPONSE_T cmdResponse;
 
-        cmdResponse.commandID  = MSG_ID_DG_START_STOP_HEAT_DISINFECT;
+        cmdResponse.commandID  = DG_CMD_START_CHEM_DISINFECT;
         cmdResponse.rejected   = FALSE;
         cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_NONE;
 
@@ -504,15 +505,15 @@
             cmdResponse.rejected   = TRUE;
             cmdResponse.rejectCode = ( STATE_OPEN == getSwitchStatus( DIALYSATE_CAP ) ? REQUEST_REJECT_REASON_DG_DIALYSATE_CAP_OPEN :
                                                                                         REQUEST_REJECT_REASON_DG_CONCENTRATE_CAP_OPEN );
-
-            sendCommandResponseMsg( &cmdResponse );
-        }
+       }
         else
 #endif
         {
             pendingStartDGChemicalDisinfectRequest = TRUE;
             status                                 = TRUE;
         }
+
+        sendCommandResponseMsg( &cmdResponse );
     }
 
     return status;