Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r3d87e97b9345aec63ca88d741e3bcd548f90422b -ra57e236160aae30dcc78b953fed9e3f4a9175422
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 3d87e97b9345aec63ca88d741e3bcd548f90422b)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a57e236160aae30dcc78b953fed9e3f4a9175422)
@@ -186,6 +186,7 @@
 
     if( heater < NUM_OF_DG_HEATERS )
     {
+#ifndef DISABLE_HEATERS_AND_TEMPS
         // Assume the target temperature has not changed
         heatersStatus[ heater ].hasTargetTempChanged = FALSE;
 
@@ -196,6 +197,7 @@
             heatersStatus[ heater ].hasTargetTempChanged = TRUE;
             result                                       = TRUE;
         }
+#endif
     }
     else
     {
@@ -241,6 +243,7 @@
 {
     BOOL status = FALSE;
 
+
     if( heater < NUM_OF_DG_HEATERS )
     {
         if ( HEATER_EXEC_STATE_OFF == heatersStatus[ heater ].state )
Index: firmware/App/Controllers/LoadCell.c
===================================================================
diff -u -r3839f1c5cad3fe04a969622bb621fc50f2182da9 -ra57e236160aae30dcc78b953fed9e3f4a9175422
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 3839f1c5cad3fe04a969622bb621fc50f2182da9)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision a57e236160aae30dcc78b953fed9e3f4a9175422)
@@ -100,7 +100,7 @@
  * @details Outputs: LoadCell module initialized.
  * @return none
  *************************************************************************/
- void initLoadCell( void )
+void initLoadCell( void )
 {
     U32 i;
     U32 j;
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -re5713fcc4511a625434a4748f7dded3d237acdf8 -ra57e236160aae30dcc78b953fed9e3f4a9175422
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision e5713fcc4511a625434a4748f7dded3d237acdf8)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision a57e236160aae30dcc78b953fed9e3f4a9175422)
@@ -78,7 +78,7 @@
 
 // 2m long tubing to cap = 19.5 mL (acid line) + 7.92 mL/m * 2 m (tubing to cap) + 20.82 mL (straw) = 56.15 mL
 // Prime time in seconds = ( 56.15 mL / 48 mL/min ) x 60 second/min + 25 seconds margin time = 95 seconds.
-#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 95 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
+#define PRIME_CONCENTRATE_LINES_TIME_OUT_MS             ( 60 * MS_PER_SECOND )                               ///< Time required to prime the concentrate lines.
 #define FLUSH_BUBBLES_PUMP_TIME_OUT_MS                  ( 2  * MS_PER_SECOND )                               ///< RO pump on during flush bubble interval in ms.
 #define DIALYSATE_TEMPERATURE_TOLERANCE_C               2.0F                                                 ///< Dialysate temperature tolerance in degree C.
 #define DATA_PUBLISH_COUNTER_START_COUNT                63                                                   ///< Data publish counter start count.
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -reeaab2a9a685fb18845888d91040d3aa01977f6d -ra57e236160aae30dcc78b953fed9e3f4a9175422
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision a57e236160aae30dcc78b953fed9e3f4a9175422)
@@ -325,15 +325,15 @@
 {
     DG_POST_STATE_T result = postState;
 
-    if ( ( SELF_TEST_STATUS_PASSED == testStatus ) || ( SELF_TEST_STATUS_FAILED == testStatus ) )
+    if ( ( testStatus == SELF_TEST_STATUS_PASSED ) || ( testStatus == SELF_TEST_STATUS_FAILED ) )
     {
-        BOOL passed = ( SELF_TEST_STATUS_PASSED == testStatus ? TRUE : FALSE );
+        BOOL passed = ( testStatus == SELF_TEST_STATUS_PASSED ? TRUE : FALSE );
 
         // Broadcast passed POST result
         sendPOSTTestResult( (DG_POST_STATE_T)((int)postState), passed );
         // Move on to next POST test
         result = (DG_POST_STATE_T)((int)postState + 1);
-        if ( SELF_TEST_STATUS_FAILED == testStatus )
+        if ( testStatus == SELF_TEST_STATUS_FAILED )
         {
             tempPOSTPassed = FALSE;
         }