Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -rd70d93528b59ef7b09032a3bf4128bee0ff6e297
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision d70d93528b59ef7b09032a3bf4128bee0ff6e297)
@@ -56,6 +56,7 @@
 #define CONCENTRATE_PUMP_VOLUME_PER_PULSE                   ( CONCENTRATE_PUMP_VOLUME_PER_REV / CONCENTRATE_PUMP_PULSE_PER_REV )
 
 #define CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL              ( 500 / TASK_GENERAL_INTERVAL )                     ///< Interval (ms/task time) at which the concentrate pump is monitored.
+
 #define CONCENTRATE_PUMP_CONTROL_INTERVAL                   ( 1 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )       ///< Interval (ms/task time) at which the concentrate pump is controlled.
 #define CONCENTRATE_PUMP_SPEED_CONTROL_PERSISTENCE_PERIOD   ( 5 * MS_PER_SECOND )                               ///< Persistence period for concentrate pump speed control error.
 
Index: firmware/App/Controllers/ConductivitySensors.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -rd70d93528b59ef7b09032a3bf4128bee0ff6e297
--- firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Controllers/ConductivitySensors.c	(.../ConductivitySensors.c)	(revision d70d93528b59ef7b09032a3bf4128bee0ff6e297)
@@ -284,11 +284,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/Controllers/LoadCell.c
===================================================================
diff -u -r34ae229d1508df89630f4dc5fbe9291d135f0686 -rd70d93528b59ef7b09032a3bf4128bee0ff6e297
--- firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision 34ae229d1508df89630f4dc5fbe9291d135f0686)
+++ firmware/App/Controllers/LoadCell.c	(.../LoadCell.c)	(revision d70d93528b59ef7b09032a3bf4128bee0ff6e297)
@@ -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/ModeInitPOST.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -rd70d93528b59ef7b09032a3bf4128bee0ff6e297
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision d70d93528b59ef7b09032a3bf4128bee0ff6e297)
@@ -323,15 +323,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;
         }
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -rd70d93528b59ef7b09032a3bf4128bee0ff6e297
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision d70d93528b59ef7b09032a3bf4128bee0ff6e297)
@@ -138,7 +138,6 @@
 void execOperationModes( void )
 {
     DG_OP_MODE_T newMode;
-    U32 priorSubMode = currentSubMode;
 
     priorSubMode = currentSubMode;
 
@@ -157,7 +156,6 @@
     if ( currentMode != newMode )
     {
         // handle transition to new mode
-        priorSubMode = 0;
         lastMode = currentMode;
         transitionToNewOperationMode( newMode );
         currentMode = newMode;