Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rf884f35638cad1f29601c1418e942185c5f1489b -r55603751b8d7fa62023a19807e51239c44192602
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision f884f35638cad1f29601c1418e942185c5f1489b)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 55603751b8d7fa62023a19807e51239c44192602)
@@ -28,7 +28,6 @@
 #include "Fans.h"
 #include "FPGA.h"
 #include "ModeStandby.h"
-#include "ModeTreatmentParams.h"
 #include "OperationModes.h"
 #include "RTC.h"
 #include "SampleWater.h"
@@ -2310,7 +2309,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?
@@ -5136,6 +5135,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 );