Index: firmware/App/Controllers/PresOccl.c
===================================================================
diff -u -r8373758a03ea82b46b4b313d2f2b24e3974a17f6 -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 8373758a03ea82b46b4b313d2f2b24e3974a17f6)
+++ firmware/App/Controllers/PresOccl.c	(.../PresOccl.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -421,8 +421,9 @@
 
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) )
-    {
 #endif
+    {
+
         if ( ARTERIAL_PRESSURE_NORMAL_OP == artPresStatus )
         {
             U08 artReadCtr = getFPGADVTArterialPressureReadCounter();
@@ -451,8 +452,8 @@
 
 #ifndef _RELEASE_
     if ( getSoftwareConfigStatus( SW_CONFIG_ENABLE_DVT_ARTERIAL_PRESSURE_SENSOR ) != SW_CONFIG_ENABLE_VALUE )
-    {
 #endif
+    {
         if ( 0 == artPresAlarm )
         {
             U08 artReadCtr  = getFPGAArterialPressureReadCounter();
Index: firmware/App/Controllers/Switches.c
===================================================================
diff -u -ref6d5a5ca314cbe30131156824e9d32792402fc4 -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision ef6d5a5ca314cbe30131156824e9d32792402fc4)
+++ firmware/App/Controllers/Switches.c	(.../Switches.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -104,9 +104,12 @@
                 currentSwitchStatus = ( PUMP_TRACK_SWITCH_MASK == getFPGAPumpTrackSwitchStatus() ? STATE_OPEN : STATE_CLOSED );
                 break;
 
+#ifndef _VECTORCAST_
+            // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_SWITCH_ID, i )
                 break;
+#endif
         }
 
         // Check if the current switch status is not the same as the recorded data
Index: firmware/App/Controllers/Temperatures.c
===================================================================
diff -u -r27a68f930508638f2eb6265ebb381c8918cbc37b -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 27a68f930508638f2eb6265ebb381c8918cbc37b)
+++ firmware/App/Controllers/Temperatures.c	(.../Temperatures.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -398,12 +398,15 @@
                 }
                 break;
 
+#ifndef _VECTORCAST_
+            // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 // Wrong sensor was called, raise an alarm
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_INVALID_TEMPERATURE_SENSOR_SELECTED, sensor );
                 // Wrong sensor, return temperature to be -1
                 temperature = -1.0;
                 break;
+#endif
         }
 
         // TODO remove this code and the if statement. This configuration is until the new arterial sensor is implemented everywhere so the temperature calibration
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r208ceefa8e8b1cc30feb93be771ced6d313e6995 -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 208ceefa8e8b1cc30feb93be771ced6d313e6995)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -519,11 +519,14 @@
                 break;
 #endif
 
+#ifndef _VECTORCAST_
+            // The default cannot be reached in VectorCAST since the cases are run in a for loop
             default:
                 SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_EXEC_STATE,
                                            valvesStatus[ valve ].execState );
                 valvesStatus[ valve ].execState = VALVE_STATE_IDLE;
                 break;
+#endif
         }
 
         publishValvesData( valve );
@@ -1016,12 +1019,15 @@
                 result = FALSE;
             }
         }
+#ifndef _VECTORCAST_
+        // The default cannot be reached in VectorCAST since the cases are run in a for loop
         // Invalid mode was selected
         else
         {
             SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_HD_VALVES_INVALID_CONTROL_MODE_SELECTED, (U32)valve );
             result = FALSE;
         }
+#endif
     }
 
     return result;
@@ -1500,7 +1506,6 @@
     return result;
 }
 
-#ifdef DEBUG_ENABLED
 /*********************************************************************//**
  * @brief
  * The testSetValvePWMOverride function overrides the valves PWM in bypass
@@ -1661,6 +1666,4 @@
     return result;
 }
 
-#endif
-
 /**@}*/
Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -r6e86723c766c0097c9867af984c0c7e82802537a -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 6e86723c766c0097c9867af984c0c7e82802537a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -784,7 +784,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__AVAILABLE_4, (U32)ALARM_SOURCE_HD );
     }
 }
 
@@ -1150,9 +1150,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
@@ -1654,9 +1657,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
         }
     }
 }
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -rfe44ecec55830a90280aec6796974e273982047a -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fe44ecec55830a90280aec6796974e273982047a)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -39,6 +39,7 @@
 #include "TreatmentRecirc.h"
 #include "TreatmentStop.h"
 #include "Utilities.h"
+#include "Valves.h"
 #include "WatchdogMgmt.h"
 
 /**
@@ -4737,7 +4738,6 @@
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
 
-#ifdef DEBUG_ENABLED
 /*********************************************************************//**
  * @brief
  * The handleSetHDValvePWMOverrideRequest function handles a request to
@@ -4769,7 +4769,6 @@
     // Respond to request
     sendTestAckResponseMsg( (MSG_ID_T)message->hdr.msgID, result );
 }
-#endif
 
 /*********************************************************************//**
  * @brief
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -r6e86723c766c0097c9867af984c0c7e82802537a -r556e92463ab2f246b151d31d8bcd96b3ee87ad3f
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 6e86723c766c0097c9867af984c0c7e82802537a)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 556e92463ab2f246b151d31d8bcd96b3ee87ad3f)
@@ -572,10 +572,8 @@
 // MSG_ID_HD_VALVES_SET_POSITION
 void handleSetHDValvePositionOverrideRequest( MESSAGE_T *message );
 
-#ifdef DEBUG_ENABLED
 // MSG_ID_HD_VALVES_SET_PWM_OVERRIDE
 void handleSetHDValvePWMOverrideRequest( MESSAGE_T *message );
-#endif
 
 // MSG_ID_HD_SOFTWARE_RESET_REQUEST
 void handleHDSoftwareResetRequest( MESSAGE_T *message );