Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c -r3c1ca4197b63f7988fe3bf58cf80299e4481416a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2d8f95eaae3bcb7027f5e96809ddc6e9c0efbc4c)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 3c1ca4197b63f7988fe3bf58cf80299e4481416a)
@@ -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 );
         }
     }
 
@@ -3135,7 +3135,7 @@
 * @param message a pointer to the message to handle
 * @return none
 *************************************************************************/
-BOOL handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message )
+void handleSetDGOpModeBroadcastIntervalOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;