Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rb607a94701f5844f2e850783239d1cb2df87fcd5 -r09cde48e11d32be58fe9e1e7c88ada33cff664f5
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision b607a94701f5844f2e850783239d1cb2df87fcd5)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 09cde48e11d32be58fe9e1e7c88ada33cff664f5)
@@ -341,7 +341,7 @@
     // create a message record
     blankMessage( &msg );
     msg.hdr.msgID = MSG_ID_ALARM_TRIGGERED;
-    msg.hdr.payloadLen = sizeof( U32 ) * 5;
+    msg.hdr.payloadLen = sizeof( U32 ) * 8;
 
     memcpy( payloadPtr, &alarm, sizeof( U32 ) );
     payloadPtr += sizeof( U32 );
@@ -1551,9 +1551,9 @@
         U32 mode    = 0;
         U32 subMode = 0;
 
-        memcpy( payloadPtr, &mode, sizeof( U32 ) );
+        memcpy( &mode, payloadPtr, sizeof( U32 ) );
         payloadPtr += sizeof( U32 );
-        memcpy( payloadPtr, &subMode, sizeof( U32 ) );
+        memcpy( &subMode, payloadPtr, sizeof( U32 ) );
 
         setHDOperationMode( mode, subMode );
         status = TRUE;