Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -rde91824d9790638e0a17fa0278d22a3f57ed28c3 -r6264a775ffd3bd50c9146e93a5e6f50b21f2981f
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 6264a775ffd3bd50c9146e93a5e6f50b21f2981f)
@@ -180,7 +180,7 @@
 
         data.cp1CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1SetSpeed * -1.0 : cp1SetSpeed );
         data.cp1MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp1Speed * -1.0 : cp1Speed );
-        data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp1Direction ? cp2SetSpeed * -1.0 : cp2SetSpeed );
+        data.cp2CurrentSetSpeed = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2SetSpeed * -1.0 : cp2SetSpeed );
         data.cp2MeasuredSpeed   = ( CONCENTRATE_PUMP_REVERSE_DIR == cp2Direction ? cp2Speed * -1.0 : cp2Speed );
 
 #ifndef DISABLE_DIALYSATE_CHECK
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rde91824d9790638e0a17fa0278d22a3f57ed28c3 -r6264a775ffd3bd50c9146e93a5e6f50b21f2981f
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 6264a775ffd3bd50c9146e93a5e6f50b21f2981f)
@@ -48,13 +48,13 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2  * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
 #define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds.
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0                                             ///< Acid pump speed in mL/min.
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6                                              ///< Bicarb pump speed in mL/min.
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rde91824d9790638e0a17fa0278d22a3f57ed28c3 -r6264a775ffd3bd50c9146e93a5e6f50b21f2981f
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 6264a775ffd3bd50c9146e93a5e6f50b21f2981f)
@@ -99,7 +99,7 @@
     switch ( postState )
     {
         case DG_POST_STATE_START:
-            SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_STARTUP, 0, 0 )
+            SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_STARTUP, 0, 0 );
             postState = DG_POST_STATE_FW_COMPATIBILITY;
 #ifdef SKIP_POST
             postState = DG_POST_STATE_COMPLETED;
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r50a01b77ced16a3ceaec0ea3828502c7a2a286d4 -r6264a775ffd3bd50c9146e93a5e6f50b21f2981f
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 50a01b77ced16a3ceaec0ea3828502c7a2a286d4)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 6264a775ffd3bd50c9146e93a5e6f50b21f2981f)
@@ -202,7 +202,7 @@
     // Send sub-mode change event when appropriate
     if ( priorSubMode != currentSubMode )
     {
-        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode )
+        SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_SUB_MODE_CHANGE, priorSubMode, currentSubMode );
     }
     priorSubMode = currentSubMode;
 
@@ -305,7 +305,7 @@
  *************************************************************************/
 static void transitionToNewOperationMode( DG_OP_MODE_T newMode )
 {
-    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, lastMode, newMode )
+    SEND_EVENT_WITH_2_U32_DATA( DG_EVENT_OP_MODE_CHANGE, lastMode, newMode );
 
     // setup for new operating mode
     switch ( newMode )