Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -rede368b67b0aecd60a9d90546eca353eb6f86e58 -rb3108eec7a9d8192d86e9c44fbf74635dd69c769
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision ede368b67b0aecd60a9d90546eca353eb6f86e58)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision b3108eec7a9d8192d86e9c44fbf74635dd69c769)
@@ -95,7 +95,7 @@
  * @details Outputs: LoadCell module initialized.
  * @return none
  *************************************************************************/
- void initLoadCell( void )
+void initLoadCell( void )
 {
     U32 i;
     U32 j;
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rede368b67b0aecd60a9d90546eca353eb6f86e58 -rb3108eec7a9d8192d86e9c44fbf74635dd69c769
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision ede368b67b0aecd60a9d90546eca353eb6f86e58)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision b3108eec7a9d8192d86e9c44fbf74635dd69c769)
@@ -49,13 +49,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.
+#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 1 * 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.
@@ -302,6 +302,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );