Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r8af127784aeb07ce7bfc2d6ea6eb2e3e3e68ea32 -rdf73b890557a3e0b7a6570af37f69de169783287
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 8af127784aeb07ce7bfc2d6ea6eb2e3e3e68ea32)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision df73b890557a3e0b7a6570af37f69de169783287)
@@ -369,12 +369,11 @@
         measuredROFlowRateLPM.data = flow - ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP1_ACID ) / ML_PER_LITER ) -
                                             ( getMeasuredPumpSpeed( CONCENTRATEPUMPS_CP2_BICARB ) / ML_PER_LITER );
 
-       // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that
-       // the flow is 0.
-       if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
-       {
-          measuredROFlowRateLPM.data = 0.0;
-       }
+        // If the flow is less than a certain value, FPGA will return 0xFFFF meaning that the flow is 0.
+        if ( FLOW_SENSOR_ZERO_READING == roFlowReading )
+        {
+            measuredROFlowRateLPM.data = 0.0;
+        }
 
         measuredFlowReadingsSum = 0;
         flowFilterCounter       = 0;
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rc65551beea443f6fb5a50c5be5af73c97fe77cf5 -rdf73b890557a3e0b7a6570af37f69de169783287
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision c65551beea443f6fb5a50c5be5af73c97fe77cf5)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision df73b890557a3e0b7a6570af37f69de169783287)
@@ -61,6 +61,8 @@
 static BOOL rinseConcentrateLines;                                                            ///< Flag indicates to rinse concentrate lines.
 static U32 rinseConcentrateLinesTimerCtr;                                                     ///< Timer counter for rinsing concentrate lines.
 static U32 dialysateDrainStartTime;                                                           ///< Dialysate drain start time.
+static BOOL rinseConcentrateLines;                                                            ///< Flag indicates to rinse concentrate lines.
+static U32 rinseConcentrateLinesTimerCtr;                                                     ///< Timer counter for rinsing concentrate lines.
 
 // ********** private function prototypes **********
 static DG_DRAIN_STATE_T handleDrainStateStart( void );