Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r5da107b6f75d3454200094eb8d31b1bb87d2a1a2 -re92a64cc9e95e2c79a5ff88d183ec33d8baa9745
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 5da107b6f75d3454200094eb8d31b1bb87d2a1a2)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e92a64cc9e95e2c79a5ff88d183ec33d8baa9745)
@@ -278,17 +278,26 @@
     BOOL result;
     MESSAGE_T msg;
     U08 *payloadPtr = msg.payload;
+    U32 data;
 
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( U32 ) + sizeof( ALARM_DATA_T ) + sizeof( ALARM_DATA_T );
+    msg.hdr.payloadLen = sizeof( U32 ) * 5;
 
     memcpy( payloadPtr, &alarm, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
-    memcpy( payloadPtr, &almData1, sizeof( ALARM_DATA_T ) );
-    payloadPtr += sizeof( ALARM_DATA_T );
-    memcpy( payloadPtr, &almData2, sizeof( ALARM_DATA_T ) );
+    data = (U32)almData1.dataType;
+    memcpy( payloadPtr, &data, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    data = almData1.data.uInt.data;
+    memcpy( payloadPtr, &data, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    data = (U32)almData2.dataType;
+    memcpy( payloadPtr, &data, sizeof( U32 ) );
+    payloadPtr += sizeof( U32 );
+    data = almData2.data.uInt.data;
+    memcpy( payloadPtr, &data, sizeof( U32 ) );
 
     // serialize the message (w/ sync, CRC, and appropriate CAN padding) and add serialized message data to appropriate comm buffer
     result = serializeMessage( msg, COMM_BUFFER_OUT_CAN_DG_ALARM, ACK_REQUIRED );
@@ -530,7 +539,9 @@
 
     DG_ACID_CONCENTRATES_RECORD_T acid     = getAcidConcentrateCalRecord();
     DG_BICARB_CONCENTRATES_RECORD_T bicarb = getBicarbConcentrateCalRecord();
-    U32 fillPrepTimeMS = 9000; // TODO make a get for this in mode fill
+    // By the time these are requested, the prepare time is no longer needed since the concentrate lines are
+    // primed before the actual treatment starts
+    U32 fillPrepTimeMS                     = 0;
 
     U08 *payloadPtr = msg.payload;