Index: firmware/App/Modes/ModePostTreat.c
===================================================================
diff -u -ra31707ccbf01a1b40f8500bc491dc9c616e7a163 -re0acc04ac66af25142762a52fd59082c128f28a7
--- firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision a31707ccbf01a1b40f8500bc491dc9c616e7a163)
+++ firmware/App/Modes/ModePostTreat.c	(.../ModePostTreat.c)	(revision e0acc04ac66af25142762a52fd59082c128f28a7)
@@ -507,7 +507,7 @@
 {
     DRAIN_STATE_T state = DRAIN_FIRST_RESERVOIR_START_STATE;
 
-    if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+    if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
     {
         state = DRAIN_FIRST_RESERVOIR_STATE;
         cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
@@ -534,14 +534,14 @@
     }
 
     // Drain has started and DG goes to re-circ mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_RECIRCULATE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
 
     if ( TRUE == isDrainCompleted )
     {
-        if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+        if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
         {
             isDrainStarted = FALSE;
             isDrainCompleted = FALSE;
@@ -592,14 +592,14 @@
     }
 
     // Drain has started and DG goes to re-circ mode flush lines state means drain completed
-    if ( ( TRUE == isDrainStarted ) && ( DG_RECIRCULATE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
+    if ( ( TRUE == isDrainStarted ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_LINES == getDGSubMode() ) )
     {
         isDrainCompleted = TRUE;
     }
 
     if ( TRUE == isDrainCompleted )
     {
-        if ( ( DG_MODE_CIRC == getDGOpMode() ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == getDGSubMode() ) )
+        if ( ( DG_MODE_GENE == getDGOpMode() ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == getDGSubMode() ) )
         {
             isDrainStarted = FALSE;
             isDrainCompleted = FALSE;
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -ra31707ccbf01a1b40f8500bc491dc9c616e7a163 -re0acc04ac66af25142762a52fd59082c128f28a7
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision a31707ccbf01a1b40f8500bc491dc9c616e7a163)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e0acc04ac66af25142762a52fd59082c128f28a7)
@@ -3295,7 +3295,7 @@
         TEMPERATURE_SENSORS_DATA_T payload;
 
         memcpy( &payload, message->payload, sizeof( TEMPERATURE_SENSORS_DATA_T ) );
-        setDialysateTemperatureReadings( payload.inletDialysate, payload.outletRedundant );
+        setDialysateTemperatureReadings( payload.TDi, payload.TRo );
     }
     // TODO - what to do if invalid payload length?
     // TODO - how to know if DG stops sending these?
@@ -6264,6 +6264,7 @@
     if ( sizeof( TEST_OVERRIDE_PAYLOAD_T ) == message->hdr.payloadLen )
     {
         memcpy( &payload, message->payload, sizeof( TEST_OVERRIDE_PAYLOAD_T ) );
+
         if ( FALSE == payload.reset )
         {
             result = testSetBatteryRemainingPercentOverride( payload.state.u32 );