Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r18541445702eb8c97b235d17c93c01d956c88dd1 -r2f7745ccdb84c09134a43a9b8ca87f619135c478
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 18541445702eb8c97b235d17c93c01d956c88dd1)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2f7745ccdb84c09134a43a9b8ca87f619135c478)
@@ -243,7 +243,7 @@
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
 
-#if !defined(_DEBUG_) && !defined (_RELEASE_) && !defined (_VECTORCAST_)
+#if !defined(DEBUG_ENABLED) && !defined (_RELEASE_) && !defined (_VECTORCAST_)
     // Compile this part of code only if it is not debug, release, or VectorCAST. This is to make sure this part of code is not compiled
     // and instrumented in VectorCAST
     // Reset the state machine
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rbecd984764c6f1737369fc7078059c46809f1864 -r2f7745ccdb84c09134a43a9b8ca87f619135c478
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision becd984764c6f1737369fc7078059c46809f1864)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 2f7745ccdb84c09134a43a9b8ca87f619135c478)
@@ -1171,7 +1171,9 @@
             break;
 
         case HEAT_DISINFECT_HEAT_UP_IN_PROGRESS:
+#ifndef _VECTORCAST_
         default:
+#endif
             heatDisinfectUIState = HEAT_DISINFECT_UI_STATE_HEAT_UP_WATER;
             break;
     }
@@ -1890,7 +1892,7 @@
             {
                 stopHeater( DG_TRIMMER_HEATER );
             }
-            else if ( ( TDiTempC < HEAT_DISINFECT_TRIMMER_HEATER_STOP_TEMP_C ) && ( FALSE == isHeaterOn( DG_TRIMMER_HEATER ) ) )
+            else if ( FALSE == isHeaterOn( DG_TRIMMER_HEATER ) )
             {
                 setHeaterTargetTemperature( DG_TRIMMER_HEATER, HEAT_DISINFECT_TRIM_HEATER_TARGET_TEMP_C );
                 startHeater( DG_TRIMMER_HEATER );