Index: firmware/App/Controllers/SyringePump.c
===================================================================
diff -u -r563f516a81cb41290008f93b33e7cf5e121717db -r6e4bd21dee082a57f919a7a97954376ea2bc01ad
--- firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 563f516a81cb41290008f93b33e7cf5e121717db)
+++ firmware/App/Controllers/SyringePump.c	(.../SyringePump.c)	(revision 6e4bd21dee082a57f919a7a97954376ea2bc01ad)
@@ -1657,7 +1657,7 @@
     // Check for stall
      if ( fabs( getSyringePumpMeasRate() ) < SYRINGE_PUMP_STALL_SPEED_THRESHOLD )
      {
-         if ( ++syringePumpStallCtr > SYRINGE_PUMP_RAMP_STALL_TIME )
+         if ( ++syringePumpStallCtr >= SYRINGE_PUMP_RAMP_STALL_TIME )
          {
              if ( ++syringePumpStallRetryCount <= SYRINGE_PUMP_RAMP_STALL_RETRIES )
              {
@@ -1746,7 +1746,7 @@
  *************************************************************************/
 static void calcMeasRate( void )
 {
-    if ( ++syringePumpSpeedCalcTimerCounter > SYRINGE_PUMP_SPEED_CALC_INTERVAL )
+    if ( ++syringePumpSpeedCalcTimerCounter >= SYRINGE_PUMP_SPEED_CALC_INTERVAL )
     {
         S32 pos = getSyringePumpPosition();
         U32 nextIdx = INC_WRAP( syringePumpMotorSpeedCalcIdx, 0, SYRINGE_PUMP_SPEED_CALC_BUFFER_LEN - 1 );
Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r27f3db92495948d4c1192421c1b0c20338c4a034 -r6e4bd21dee082a57f919a7a97954376ea2bc01ad
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 6e4bd21dee082a57f919a7a97954376ea2bc01ad)
@@ -1216,7 +1216,7 @@
 static void publishValvesData( VALVE_T valve )
 {
     // Check the counter
-    if ( ++valvesStatus[ valve ].dataPublishCounter > getPublishValvesDataInterval() )
+    if ( ++valvesStatus[ valve ].dataPublishCounter >= getPublishValvesDataInterval() )
     {
         HD_VALVE_DATA_T valveData;
         valveData.valveID      = (U32)valve;
Index: firmware/App/Controllers/Voltages.c
===================================================================
diff -u -r21180e0b65fddfa27f66d8fb59cb55b2db304230 -r6e4bd21dee082a57f919a7a97954376ea2bc01ad
--- firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 21180e0b65fddfa27f66d8fb59cb55b2db304230)
+++ firmware/App/Controllers/Voltages.c	(.../Voltages.c)	(revision 6e4bd21dee082a57f919a7a97954376ea2bc01ad)
@@ -203,7 +203,7 @@
 
         if ( volts > MAX_VOLTAGES[ i ] )
         {
-            if ( ++voltageAlarmPersistenceCtr[ i ] > VOLTAGES_ALARM_PERSISTENCE )
+            if ( ++voltageAlarmPersistenceCtr[ i ] >= VOLTAGES_ALARM_PERSISTENCE )
             {
 #ifndef DISABLE_VOLTAGE_MONITOR
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, (F32)i, volts )
@@ -212,7 +212,7 @@
         }
         else if ( volts < MIN_VOLTAGES[ i ] )
         {
-            if ( ++voltageAlarmPersistenceCtr[ i ] > VOLTAGES_ALARM_PERSISTENCE )
+            if ( ++voltageAlarmPersistenceCtr[ i ] >= VOLTAGES_ALARM_PERSISTENCE )
             {
 #ifndef DISABLE_VOLTAGE_MONITOR
                 SET_ALARM_WITH_2_F32_DATA( ALARM_ID_HD_VOLTAGE_OUT_OF_RANGE, (F32)i, volts )
Index: firmware/App/Drivers/Battery.c
===================================================================
diff -u -ra8a0f729b78556c2c58a72bad942d04a9dead3f5 -r6e4bd21dee082a57f919a7a97954376ea2bc01ad
--- firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision a8a0f729b78556c2c58a72bad942d04a9dead3f5)
+++ firmware/App/Drivers/Battery.c	(.../Battery.c)	(revision 6e4bd21dee082a57f919a7a97954376ea2bc01ad)
@@ -78,7 +78,7 @@
         {
             if ( ( batteryStatus & BATTERY_STATUS_AC_PRESENT_MASK ) == 0 )
             {
-                if ( ++lostACPowerPersistentCount > AC_POWER_LOST_PERSISTENT_COUNT )
+                if ( ++lostACPowerPersistentCount >= AC_POWER_LOST_PERSISTENT_COUNT )
                 {
                     SET_ALARM_WITH_1_U32_DATA( ALARM_ID_HD_AC_POWER_LOST, (U32)batteryStatus );
                 }