Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -r5156a859330f51537606ffdab32ea63d8fac9cac -rf1a45ef5ae450c31c0757ca9bac414f12d5844dd
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 5156a859330f51537606ffdab32ea63d8fac9cac)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision f1a45ef5ae450c31c0757ca9bac414f12d5844dd)
@@ -134,11 +134,6 @@
 #endif
             break;
 
-        case DG_POST_STATE_HEATERS:
-            testStatus = execHeatersSelfTest();
-            postState = handlePOSTStatus( testStatus );
-            break;
-
         case DG_POST_STATE_ACCELEROMETER:
 #ifndef DISABLE_ACCELS
             testStatus = execAccelTest();
Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -r847478dd75aac2edfe27df454ac5a644b6f30040 -rf1a45ef5ae450c31c0757ca9bac414f12d5844dd
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 847478dd75aac2edfe27df454ac5a644b6f30040)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision f1a45ef5ae450c31c0757ca9bac414f12d5844dd)
@@ -91,6 +91,10 @@
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+#ifndef V_2_SYSTEM
+    setValveStateDelayed( VRD1, VALVE_STATE_CLOSED, 0 );
+    setValveStateDelayed( VRD2, VALVE_STATE_CLOSED, 0 );
+#endif
     setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
 
     signalDrainPumpHardStop();