Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r4b8363716866a9850de172af1609008fccf0ee74 -r491bddb51ce331490567666795549c17f78a0e68
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 4b8363716866a9850de172af1609008fccf0ee74)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 491bddb51ce331490567666795549c17f78a0e68)
@@ -7,8 +7,8 @@
 *
 * @file    SystemComm.c
 *
-* @author  (last)      Darren Cox
-* @date    (last)      10-Mar-2022
+* @author  (last)      Dara Navaei
+* @date    (last)      26-May-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -783,7 +783,7 @@
 {
     if ( TRUE == incTimeWindowedCount( TIME_WINDOWED_COUNT_BAD_MSG_CRC ) )
     {
-        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_COMM_TOO_MANY_BAD_CRCS, (U32)ALARM_SOURCE_HD );
     }
 }
 
@@ -1149,9 +1149,12 @@
             handleTesterLogInRequest( message );
             break;
 
+#ifndef _VECTORCAST_
+        // The default cannot be reached in VectorCAST since the cases are run in a for loop
         default:
             // Un-recognized or un-handled message ID received - ignore
-            break;
+            break;
+#endif
     }
 
     // Handle any test messages if tester has logged in successfully
@@ -1649,9 +1652,12 @@
                 handleSetBloodLeakEmbeddedModeCommand( message );
                 break;
 
+#ifndef _VECTORCAST_
+            // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Unrecognized message ID received - ignore
-                break;
+                break;
+#endif
         }
     }
 }