Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rdbfeaf78c05fc922eba6ff8c7a31ba8a9392c642 -rcc4f797163697151084f48523b93a420dbf35388
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision dbfeaf78c05fc922eba6ff8c7a31ba8a9392c642)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision cc4f797163697151084f48523b93a420dbf35388)
@@ -779,7 +779,7 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_ALARM_EVENT;
-    msg.hdr.payloadLen = sizeof( ALARM_ID_T ) + 2 * sizeof( F32 );
+    msg.hdr.payloadLen = sizeof( U32 ) + 2 * sizeof( F32 );
 
     memcpy( payloadPtr, &id, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
@@ -812,7 +812,7 @@
     // Create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_HD_TREATMENT_LOG_EVENT;
-    msg.hdr.payloadLen = sizeof( EVENT_ID_T ) + 2 * sizeof( F32 );
+    msg.hdr.payloadLen = sizeof( U32 ) + 2 * sizeof( F32 );
 
     memcpy( payloadPtr, &eventID, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );