Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r0ee5103ebceb698eadac7b18398471361811a151 -r2046b91dd8e5255afa2e97684de2819931c45ac4
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 0ee5103ebceb698eadac7b18398471361811a151)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 2046b91dd8e5255afa2e97684de2819931c45ac4)
@@ -289,11 +289,9 @@
 /*********************************************************************//**
  * @brief
  * The checkInletWaterConductivity function checks inlet water conductivity value
- * and triggers an alarm when conductivity value is not within the specified
- * values.
+ * and triggers an alarm when conductivity value is out of allowed range.
  * @details Inputs: CPi sensor conductivity
- * @details Outputs: Trigger warning alarm if conductivity is in the warning
- * range. Trigger alarm if conductivity is below minimum conductivity.
+ * @details Outputs: Trigger alarms when conductivity is out of allowed range
  * @return none
  *************************************************************************/
 void checkInletWaterConductivity( void )
Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r63e00142f31734fa1dfcba6503af7072ee5fda6b -r2046b91dd8e5255afa2e97684de2819931c45ac4
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 63e00142f31734fa1dfcba6503af7072ee5fda6b)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2046b91dd8e5255afa2e97684de2819931c45ac4)
@@ -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 -r0ee5103ebceb698eadac7b18398471361811a151 -r2046b91dd8e5255afa2e97684de2819931c45ac4
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 0ee5103ebceb698eadac7b18398471361811a151)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 2046b91dd8e5255afa2e97684de2819931c45ac4)
@@ -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;
         }