Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -rf47dd3b39499eee03d3e93236335c087b4ad71fb -rc7accd06c36151ab8664897bfa6a877f223bb27a
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision f47dd3b39499eee03d3e93236335c087b4ad71fb)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision c7accd06c36151ab8664897bfa6a877f223bb27a)
@@ -1678,7 +1678,7 @@
                 handleTestFansRPMAlarmStartTimeOffsetRequest( message );
                 break;
 
-            case MSG_ID_HD_SYRINGE_PUMP_HEPRIN_BOLUS_TARGET_RATE_OVERRIDE:
+            case MSG_ID_HD_SYRINGE_PUMP_HEPARIN_BOLUS_TARGET_RATE_OVERRIDE:
                 handleTestSyringePumpHeprinBolusTargetRateOverrideRequest( message );
                 break;
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r40bb574439c38b44ac282d3f7f151d936379c75f -rc7accd06c36151ab8664897bfa6a877f223bb27a
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 40bb574439c38b44ac282d3f7f151d936379c75f)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision c7accd06c36151ab8664897bfa6a877f223bb27a)
@@ -1663,13 +1663,13 @@
     BOOL result        = FALSE;
     U32 rejReason      = REQUEST_REJECT_REASON_NONE;
     U08 *payloadPtr    = msg.payload;
-    U32 messagePayload = message->payload;
+    U32 messagePayload = (U32)message->payload;
 
     if ( message->hdr.payloadLen == sizeof( U32 ) )
     {
         U32 epoch;
 
-        memcpy( &epoch,  messagePayload, sizeof( U32 ) );
+        memcpy( &epoch, &messagePayload, sizeof( U32 ) );
         result = setRTCEpoch( epoch );
         if ( FALSE == result )
         {