Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r233034b67edaee48012bf9a5478327519e0256bb -r992dce16d63424ddd30fe9ac2f819e9a53b21977
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 233034b67edaee48012bf9a5478327519e0256bb)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 992dce16d63424ddd30fe9ac2f819e9a53b21977)
@@ -25,8 +25,8 @@
 #include "FPGA.h"
 #include "Heaters.h"
 #include "ModeFlush.h"
+#include "ModeGenIdle.h"
 #include "ModeStandby.h"
-#include "ModeRecirculate.h"
 #include "MsgQueues.h"
 #include "NVDataMgmt.h"
 #include "OperationModes.h"
@@ -1572,11 +1572,11 @@
 
         memcpy( &startingTreatment, message->payload, sizeof( U32 ) );
 
-        if ( DG_MODE_STAN == getCurrentOperationMode() && TRUE == startingTreatment )
+        if ( ( DG_MODE_STAN == getCurrentOperationMode() ) && ( TRUE == startingTreatment ) )
         {
             result = requestDGStart();
         }
-        else if ( DG_MODE_CIRC == getCurrentOperationMode() && FALSE == startingTreatment )
+        else if ( ( DG_MODE_GENE == getCurrentOperationMode() ) && ( FALSE == startingTreatment ) )
         {
             result = requestDGStop();
         }
@@ -2909,11 +2909,11 @@
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
         if ( ( BOOL )payload.state.u32 )
         {
-            requestConcentratePumpsOn( ( CONCENTRATE_PUMPS_T )payload.index );
+            requestConcentratePumpOn( ( CONCENTRATE_PUMPS_T )payload.index );
         }
         else
         {
-            requestConcentratePumpsOff( ( CONCENTRATE_PUMPS_T )payload.index );
+            requestConcentratePumpOff( ( CONCENTRATE_PUMPS_T )payload.index );
         }
     }