Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r2a6ac80309cb52922f856b3eb4ff2c876b44c0d6 -r33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 2a6ac80309cb52922f856b3eb4ff2c876b44c0d6)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 33eb95dbdfee4c63f6f88a8972a5e08d2ce30bad)
@@ -819,8 +819,8 @@
     msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_DATA_RESPONSE;
     msg.hdr.payloadLen = sizeof( BOOL ) + sizeof( U32 ) + sizeof( TREATMENT_LOG_DATA_PAYLOAD_T );
 
-    memcpy( payloadPtr, &accepted, sizeof( U32 ) );
-    payloadPtr += sizeof( U32 );
+    memcpy( payloadPtr, &accepted, sizeof( BOOL ) );
+    payloadPtr += sizeof( BOOL );
     memcpy( payloadPtr, &reason, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
     memcpy( payloadPtr, logDataPtr, sizeof( TREATMENT_LOG_DATA_PAYLOAD_T ) );
@@ -2307,7 +2307,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?
@@ -5123,6 +5123,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 );