Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -r4f4050a451d88043f170814d9929ff497dc43030 -rdbcbd145954ef52510ac929a412e0dba42f0941b
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 4f4050a451d88043f170814d9929ff497dc43030)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision dbcbd145954ef52510ac929a412e0dba42f0941b)
@@ -1160,7 +1160,7 @@
     msg.hdr.msgID = MSG_ID_TEMP_FAST_HD_VALVES_REMOVE_LATER;
     msg.hdr.payloadLen = sizeof( HD_VALVE_FAST_DATA_T );
 
-    memcpy( payloadPtr, &fastDataRemoveLater, sizeof( HD_VALVE_FAST_DATA_T ) );
+    memcpy( payloadPtr, fastDataRemoveLater, sizeof( HD_VALVE_FAST_DATA_T ) );
 
     // 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_HD_BROADCAST, ACK_NOT_REQUIRED );
@@ -2450,7 +2450,7 @@
 void handleTestHDValvesBroadcastIntervalOverrideRequest( MESSAGE_T *message )
 {
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
-    BOOL result = 0;
+    BOOL result = FALSE;
 
     // verify payload length
     if ( sizeof(TEST_OVERRIDE_ARRAY_PAYLOAD_T) == message->hdr.payloadLen )
@@ -2529,6 +2529,7 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
+#ifdef DEBUG_ENABLED
 /*************************************************************************
  * @brief
  * The handleSetHDValvePWMOverrideRequest function handles a request to
@@ -2559,5 +2560,6 @@
     /* respond to request */
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
+#endif
 
 /**@}*/