Index: firmware/App/Controllers/PermeateTank.c
===================================================================
diff -u -r7e4bcfd25226dcac849ba52f417fd08865d04c2c -raf6229de70ba23f234dbfa8012d5f37cd2812563
--- firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision 7e4bcfd25226dcac849ba52f417fd08865d04c2c)
+++ firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision af6229de70ba23f234dbfa8012d5f37cd2812563)
@@ -337,7 +337,7 @@
             setValveState( P33_VALV, VALVE_STATE_OPEN );
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
-            setValveState( P39_VALV, VALVE_STATE_OPEN );
+            setValveState( P39_VALV, VALVE_STATE_CLOSED );
             setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
             tankFullDelayTime = getMSTimerCount();
Index: firmware/App/Controllers/ROPump.c
===================================================================
diff -u -r617a2fa278e4a4426bfbe22b39ae9defbcedd778 -raf6229de70ba23f234dbfa8012d5f37cd2812563
--- firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision 617a2fa278e4a4426bfbe22b39ae9defbcedd778)
+++ firmware/App/Controllers/ROPump.c	(.../ROPump.c)	(revision af6229de70ba23f234dbfa8012d5f37cd2812563)
@@ -37,7 +37,7 @@
 // ********** private definitions **********
 
 #define RO_PUMP_DATA_PUB_INTERVAL                   ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                           ///< Interval (ms/task time) at which the RO Pump data is published on the CAN bus.
-#define ROP_CONTROL_INTERVAL                        ( (3*MS_PER_SECOND) / TASK_GENERAL_INTERVAL )                           ///< Interval (ms/task time) at which the RO pump is controlled.
+#define ROP_CONTROL_INTERVAL                        ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )                           ///< Interval (ms/task time) at which the RO pump is controlled.
 
 #define ROP_FLOW_CONTROL_P_COEFFICIENT              0.1F                                                              ///< P term for RO pump flow control.
 #define ROP_FLOW_CONTROL_I_COEFFICIENT              0.8F                                                           ///< I term for RO pump flow control.
@@ -367,7 +367,7 @@
     BOOL result = FALSE;
 
     // First of all, the flow rate must be in range
-    if ( ( roFlowRate <= MAX_RO_FLOWRATE_MLPM ) && ( roFlowRate >= MIN_RO_FLOWRATE_MLPM ) )
+    if ( roFlowRate <= MAX_RO_FLOWRATE_MLPM )
     {
         targetROPumpFlowRate.data = roFlowRate;
         roPumpControlMode = PUMP_CONTROL_MODE_CLOSED_LOOP;
Index: firmware/App/Modes/FPOperationModes.c
===================================================================
diff -u -r94d93795b2a516b3bdd7fc7030eb5eac933bfcd0 -raf6229de70ba23f234dbfa8012d5f37cd2812563
--- firmware/App/Modes/FPOperationModes.c	(.../FPOperationModes.c)	(revision 94d93795b2a516b3bdd7fc7030eb5eac933bfcd0)
+++ firmware/App/Modes/FPOperationModes.c	(.../FPOperationModes.c)	(revision af6229de70ba23f234dbfa8012d5f37cd2812563)
@@ -53,15 +53,15 @@
 
 /// This matrix determines legal transitions from one mode to another
 static const FP_OP_MODE_T MODE_TRANSITION_TABLE[ NUM_OF_FP_MODES - 1 ][ NUM_OF_FP_MODES - 1 ] = {
-// From    to->    FAULT         SERVICE       INIT          STANBY        PGEN          GENW          DPGW          DEGW
+// From    to->    FAULT         SERVICE       INIT          STANBY        PGEN          GENW          DPGP          DEGP
 /* FAUL     */{ FP_MODE_FAUL, FP_MODE_SERV, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG },
 /* SERV     */{ FP_MODE_FAUL, FP_MODE_SERV, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG },
 /* INIT     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_INIT, FP_MODE_STAN, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG },
-/* STAN     */{ FP_MODE_FAUL, FP_MODE_SERV, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_PGEN, FP_MODE_GENP, FP_MODE_DPGW, FP_MODE_DEGW },
+/* STAN     */{ FP_MODE_FAUL, FP_MODE_SERV, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_PGEN, FP_MODE_GENP, FP_MODE_DPGP, FP_MODE_DEGP },
 /* PGEN     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_PGEN, FP_MODE_GENP, FP_MODE_NLEG, FP_MODE_NLEG },
 /* GENW     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_NLEG, FP_MODE_GENP, FP_MODE_NLEG, FP_MODE_NLEG },
-/* DPGW     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_DPGW, FP_MODE_DEGW },
-/* DEGW     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_DEGW } };
+/* DPGP     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_DPGP, FP_MODE_DEGP },
+/* DEGP     */{ FP_MODE_FAUL, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_STAN, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_NLEG, FP_MODE_DEGP } };
 
 // ********** private function prototypes **********
 
@@ -328,11 +328,11 @@
             currentSubMode = transitionToGenPermeateMode();
             break;
 
-        case FP_MODE_DPGW:
+        case FP_MODE_DPGP:
             //currentSubMode = transitionToPreGenWMode();
             break;
 
-        case FP_MODE_DEGW:
+        case FP_MODE_DEGP:
             //currentSubMode = transitionToGenWaterMode();
             break;
 
Index: firmware/App/Modes/ModeGenPermeateDefeatured.c
===================================================================
diff -u -r9b91228c0cb3eee3f06cfab4436e812722187839 -raf6229de70ba23f234dbfa8012d5f37cd2812563
--- firmware/App/Modes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
+++ firmware/App/Modes/ModeGenPermeateDefeatured.c	(.../ModeGenPermeateDefeatured.c)	(revision af6229de70ba23f234dbfa8012d5f37cd2812563)
@@ -230,7 +230,7 @@
 
     result = TRUE;
     pendingStartGenDefRequest = TRUE;
-    requestNewOperationMode( FP_MODE_DEGW );
+    requestNewOperationMode( FP_MODE_DEGP );
 
     return result;
 }
Index: firmware/App/Modes/ModePreGenPermeateDefeatured.c
===================================================================
diff -u -r9b91228c0cb3eee3f06cfab4436e812722187839 -raf6229de70ba23f234dbfa8012d5f37cd2812563
--- firmware/App/Modes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision 9b91228c0cb3eee3f06cfab4436e812722187839)
+++ firmware/App/Modes/ModePreGenPermeateDefeatured.c	(.../ModePreGenPermeateDefeatured.c)	(revision af6229de70ba23f234dbfa8012d5f37cd2812563)
@@ -293,7 +293,7 @@
 
     result = TRUE;
     pendingStartPreGenDefRequest = TRUE;
-    requestNewOperationMode( FP_MODE_DPGW );
+    requestNewOperationMode( FP_MODE_DPGP );
 
     return result;
 }
Index: firmware/App/Services/DDInterface.c
===================================================================
diff -u -r9cbb00a9eba347697bdf5cee63962061ffa36c92 -raf6229de70ba23f234dbfa8012d5f37cd2812563
--- firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision 9cbb00a9eba347697bdf5cee63962061ffa36c92)
+++ firmware/App/Services/DDInterface.c	(.../DDInterface.c)	(revision af6229de70ba23f234dbfa8012d5f37cd2812563)
@@ -205,7 +205,7 @@
             result = TRUE;
         }
     }
-    else if ( FP_MODE_DPGW == roMode )
+    else if ( FP_MODE_DPGP == roMode )
     {
         result = requestPreGenDefStop();
     }