Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r5d82009d1baa2b52122065934481745bf4de223b -r9b468e9886795094503fd62e6b47829876d740a3
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 5d82009d1baa2b52122065934481745bf4de223b)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 9b468e9886795094503fd62e6b47829876d740a3)
@@ -343,7 +343,7 @@
     // Check if the primary heaters' internal temperature is above the limit
     if ( primaryHeatersInternalTemp > HEATERS_MAX_ALLOWED_INTERNAL_TEMPERATURE_C )
     {
-//        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_PRIMARY_HEATERS_INTERNAL_TEMP_OUT_OF_RANGE, primaryHeatersInternalTemp );
+        SET_ALARM_WITH_1_U32_DATA( ALARM_ID_DG_PRIMARY_HEATER_INTERNAL_TEMP_OUT_OF_RANGE, primaryHeatersInternalTemp );
 
         // If it is above the range for the first time, stop the primary heaters
         // and set the variables
Index: firmware/App/Controllers/Pressures.c
===================================================================
diff -u -r841991c3676107d8ae45d967c28e656d6b111506 -r9b468e9886795094503fd62e6b47829876d740a3
--- firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 841991c3676107d8ae45d967c28e656d6b111506)
+++ firmware/App/Controllers/Pressures.c	(.../Pressures.c)	(revision 9b468e9886795094503fd62e6b47829876d740a3)
@@ -42,8 +42,6 @@
 
 #define MIN_VALID_PRESSURE_RANGE                    0.0                                             ///< Minimum valid range on pressure reading.
 #define MAX_VALID_PRESSURE_RANGE                    200.0                                           ///< Maximum valid range on pressure reading.
-#define MIN_VALID_ADC_COUNT_RANGE                   273                                             ///< Minimum valid adc count range.
-#define MAX_VALID_ADC_COUNT_RANGE                   3685                                            ///< Maximum valid adc count range.
 
 #define MIN_INLET_WATER_PRESSURE                    25                                              ///< Minimum water input pressure.
 #define INLET_WATER_PRESSURE_PERSISTENCE_PERIOD     ( 5 * MS_PER_SECOND )                           ///< Persistence period for pressure out of range error.
@@ -216,8 +214,7 @@
     for ( sensorID = 0; sensorID < NUM_OF_PRESSURE_SENSORS; sensorID++ )
     {
         pressureReading = getMeasuredDGPressure( sensorID );
-        if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE ) ||
-             ( measuredPressureReadingsRaw < MIN_VALID_ADC_COUNT_RANGE ) || ( measuredPressureReadingsRaw > MAX_VALID_ADC_COUNT_RANGE ) )
+        if ( ( pressureReading < MIN_VALID_PRESSURE_RANGE ) || ( pressureReading > MAX_VALID_PRESSURE_RANGE ) )
         {
             SET_ALARM_WITH_2_F32_DATA( ALARM_ID_PRESSURE_SENSOR_FAULT, sensorID, pressureReading );
         }
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -ra1877093454dc5252c43f5ab11b005a85e293167 -r9b468e9886795094503fd62e6b47829876d740a3
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a1877093454dc5252c43f5ab11b005a85e293167)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 9b468e9886795094503fd62e6b47829876d740a3)
@@ -386,6 +386,10 @@
             result = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
         }
     }
+    else
+    {
+        concentratePumpPrimeCount = 0;
+    }
 
     return result;
 }
Index: firmware/App/Services/Interrupts.c
===================================================================
diff -u -r51bdd8eedc05856cf35998d1348e3138edecfaf8 -r9b468e9886795094503fd62e6b47829876d740a3
--- firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 51bdd8eedc05856cf35998d1348e3138edecfaf8)
+++ firmware/App/Services/Interrupts.c	(.../Interrupts.c)	(revision 9b468e9886795094503fd62e6b47829876d740a3)
@@ -48,7 +48,6 @@
 static U32 sci2FrameErrorCnt;                                           ///< SCI2 frame error count.
 static U32 sci2OverrunErrorCnt;                                         ///< SCI2 overrun error count.
 
-static U32 can1PassiveCnt;                                              ///< CAN1 passive count.
 static U32 can1WarningCnt;                                              ///< CAN1 warning count.
 static U32 can1BusOffCnt;                                               ///< CAN1 bus offline count.
 static U32 can1ParityCnt;                                               ///< CAN1 parity count.
@@ -64,7 +63,6 @@
 {
     sci2FrameErrorCnt   = 0;
     sci2OverrunErrorCnt = 0;
-    can1PassiveCnt      = 0;
     can1WarningCnt      = 0;
     can1BusOffCnt       = 0;
     can1ParityCnt       = 0;