Index: firmware/App/Services/SystemComm.c
===================================================================
diff -u -ra75923f40bea362b44fc082ce8eebde7bfa97c9a -rfdaea534d10067404de9bd14b91b2a81d0a7e5ef
--- firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision a75923f40bea362b44fc082ce8eebde7bfa97c9a)
+++ firmware/App/Services/SystemComm.c	(.../SystemComm.c)	(revision fdaea534d10067404de9bd14b91b2a81d0a7e5ef)
@@ -649,7 +649,7 @@
                     // add new message to queue for later processing
                     addToMsgQueue( MSG_Q_IN, &rcvMsg );
                     // if message from HD broadcast channel, update HD comm status
-                    if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == i )
+                    if ( COMM_BUFFER_IN_CAN_HD_BROADCAST == MSG_IN_BUFFERS[ i ] )
                     {
                         hdIsCommunicating = TRUE;
                         timeOfLastHDCheckIn = getMSTimerCount();
@@ -817,7 +817,9 @@
     if ( TRUE == didTimeout( timeOfLastHDCheckIn, HD_COMM_TIMEOUT_IN_MS ) )
     {
         hdIsCommunicating = FALSE;
-        //activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
+#ifndef DEBUG_ENABLED
+        activateAlarmNoData( ALARM_ID_HD_COMM_TIMEOUT );  // TODO - add this alarm if we're in middle of a treatment? or if in a mode that comm loss would impact badly?
+#endif
     }
 }
 
Index: firmware/App/Services/SystemCommMessages.c
===================================================================
diff -u -re5c9e31c2644c7f0ca17ba81767a8ed19b99cebf -rfdaea534d10067404de9bd14b91b2a81d0a7e5ef
--- firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision e5c9e31c2644c7f0ca17ba81767a8ed19b99cebf)
+++ firmware/App/Services/SystemCommMessages.c	(.../SystemCommMessages.c)	(revision fdaea534d10067404de9bd14b91b2a81d0a7e5ef)
@@ -998,7 +998,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_U32( BOOL, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride )
+DATA_OVERRIDE_HANDLER_FUNC_U32( U32, handleTestROPumpSetPointOverrideRequest, testSetTargetROPumpPressureOverride, testResetTargetROPumpPressureOverride )
 
 /*************************************************************************
  * @brief
@@ -1010,7 +1010,7 @@
  * @param message : a pointer to the message to handle
  * @return none
  *************************************************************************/
-DATA_OVERRIDE_HANDLER_FUNC_F32( BOOL, handleTestROMeasuredFlowOverrideRequest, testSetMeasuredROFlowRateOverride, testResetMeasuredROFlowRateOverride )
+DATA_OVERRIDE_HANDLER_FUNC_F32( F32, handleTestROMeasuredFlowOverrideRequest, testSetMeasuredROFlowRateOverride, testResetMeasuredROFlowRateOverride )
 
 /*************************************************************************
  * @brief
Index: firmware/App/Tasks/TaskPriority.c
===================================================================
diff -u -r2496e9225fa1b2c627d625def02515a0f0dd5793 -rfdaea534d10067404de9bd14b91b2a81d0a7e5ef
--- firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision 2496e9225fa1b2c627d625def02515a0f0dd5793)
+++ firmware/App/Tasks/TaskPriority.c	(.../TaskPriority.c)	(revision fdaea534d10067404de9bd14b91b2a81d0a7e5ef)
@@ -16,6 +16,7 @@
 
 #include "gio.h"
 
+#include "DrainPump.h"
 #include "FPGA.h"
 #include "InternalADC.h"
 #include "LoadCell.h"
@@ -50,6 +51,9 @@
     // monitor RO pump
     execROPumpMonitor();
 
+    // monitor drain pump
+    execDrainPumpMonitor();
+
     // Temperature sensors read
     execTemperatureSensors();