Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r11a47fa824c22e255cac5ddadc17364fa27a2b0a -rea24d974f95d6d304746120d61774c196d0fc589
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 11a47fa824c22e255cac5ddadc17364fa27a2b0a)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision ea24d974f95d6d304746120d61774c196d0fc589)
@@ -959,14 +959,7 @@
 
         // Keep a running 32-bit edge count used for safety check on volume in some functions
         delta = u16BiDiffWithWrap( last, bpMotorHallSensorCount );
-        if ( delta >= 0 )
-        {
-            bloodPumpMotorEdgeCount += delta;
-        }
-        else
-        {
-            bloodPumpMotorEdgeCount -= (U16)(delta * -1);
-        }
+        bloodPumpMotorEdgeCount += (U16)delta;
 
         // Update last count for next time
         bpLastMotorHallSensorCounts[ nextIdx ] = bpMotorHallSensorCount;
Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -rdb22e9d530c5c9d62b02e6dcc72ed96fb67c165a -rea24d974f95d6d304746120d61774c196d0fc589
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision db22e9d530c5c9d62b02e6dcc72ed96fb67c165a)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision ea24d974f95d6d304746120d61774c196d0fc589)
@@ -665,7 +665,7 @@
         // Check ADC read is fresh
         if ( lastSyringePumpADCReadCtr == adcReadCtr )  // TODO - add persistence
         {
-            // activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );
+            // activateAlarmNoData( ALARM_ID_HD_SYRINGE_PUMP_ADC_ERROR );  // TODO - restore when issue with read counter resolved
         }
         lastSyringePumpADCReadCtr = adcReadCtr;
     }