Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -re8c019d3d43b517cabfdfe75fa5d03749d036018 -r224b86c0847207c168d38fa1713a1e9116642267
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision e8c019d3d43b517cabfdfe75fa5d03749d036018)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 224b86c0847207c168d38fa1713a1e9116642267)
@@ -167,10 +167,10 @@
     loadcells[ LOAD_CELL_RESERVOIR_2_BACKUP ].rawReading  = b2 & MASK_OFF_U32_MSB;
 
     // Check error bits from new readings
-    a1 = ( a1 >> 31 ) << SHIFT_24_BITS;
-    a2 = ( a2 >> 31 ) << SHIFT_16_BITS_FOR_WORD_SHIFT;
-    b1 = ( b1 >> 31 ) << SHIFT_8_BITS_FOR_BYTE_SHIFT;
-    b2 = ( b2 >> 31 );
+    a1 = ( a1 >> SHIFT_BITS_BY_31 ) << SHIFT_24_BITS;
+    a2 = ( a2 >> SHIFT_BITS_BY_31 ) << SHIFT_16_BITS_FOR_WORD_SHIFT;
+    b1 = ( b1 >> SHIFT_BITS_BY_31 ) << SHIFT_8_BITS_FOR_BYTE_SHIFT;
+    b2 = ( b2 >> SHIFT_BITS_BY_31 );
     if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, ( ( a1 > 0 ) || ( a2 > 0 ) || ( b1 > 0 ) || ( b2 > 0 ) ) ) )
     {
         SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_LOAD_CELL_ADC_ERROR, ( a1 | a2 | b1 | b2 ) )
@@ -311,7 +311,7 @@
     }
     else
     {
-        isWeightOutOfRange = ( /*fabs*/( weight ) > MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS ? TRUE : FALSE );
+        isWeightOutOfRange = ( fabs( weight ) > MAX_ALLOWED_EXTRA_WEIGHT_BEFORE_TARE_GRAMS ? TRUE : FALSE );
     }
 
     if ( FALSE == isWeightOutOfRange )