Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -rc0700a4503f28288f16070634bb87f4eccb2568c -rcec14e1b1b636760fcd44ab35f3f45a71a79b776
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision c0700a4503f28288f16070634bb87f4eccb2568c)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision cec14e1b1b636760fcd44ab35f3f45a71a79b776)
@@ -190,7 +190,7 @@
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
 #ifndef V_2_SYSTEM
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
 #else
         setValveState( VPD, VALVE_STATE_OPEN );  // TODO: VPD drain state is closed for V3
 #endif
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -rcec14e1b1b636760fcd44ab35f3f45a71a79b776
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision cec14e1b1b636760fcd44ab35f3f45a71a79b776)
@@ -1192,6 +1192,7 @@
 
             case MSG_ID_DG_FANS_DATA_PUBLISH_INTERVAL_OVERRIDE:
                 handleTestFansDataPublishIntervalOverride( message );
+                break;
 
             case MSG_ID_DG_RO_PUMP_DUTY_CYCLE_OVERRIDE:
                 handleTestROPumpDutyCycleOverride( message );
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -rcec14e1b1b636760fcd44ab35f3f45a71a79b776
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cec14e1b1b636760fcd44ab35f3f45a71a79b776)
@@ -2430,13 +2430,13 @@
  *************************************************************************/
 void handleSetFluidLeakStateDetectorOverrideRequest( MESSAGE_T *message )
 {
-    TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
+    TEST_OVERRIDE_PAYLOAD_T payload;
     BOOL result = FALSE;
 
     // Verify payload length
-    if ( sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) == message->hdr.payloadLen )
+    if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
-        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_ARRAY_PAYLOAD_T ) );
+        memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
         if ( FALSE == payload.reset )
         {
             result = testSetFluidLeakStateOverride( ( FLUID_LEAK_STATES_T)( payload.state.u32 ) );