Index: firmware/App/Controllers/ConcentratePumps.c
===================================================================
diff -u -r7d24ef2e6a4130b3a049e6106a0371fc6503271f -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc
--- firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision 7d24ef2e6a4130b3a049e6106a0371fc6503271f)
+++ firmware/App/Controllers/ConcentratePumps.c	(.../ConcentratePumps.c)	(revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc)
@@ -137,10 +137,8 @@
 static BOOL acidConcentratePumpParkPersistenceClear;                                                            ///< Boolean acid park persistence clearing.
 static BOOL bicarbConcentratePumpParkPersistenceClear;                                                          ///< Boolean for bicarb park persistence clearing.
 static BOOL ufPumpParkPersistenceClear;                                                                         ///< Boolean for UF pump park persistence clearing.
+static OVERRIDE_U32_T concentratePumpDataPublishInterval;                                                       ///< Concentrate pump data publish interval.
 
-/// Concentrate pump data publish interval.
-static OVERRIDE_U32_T concentratePumpDataPublishInterval = { CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL, CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL, 0, 0 };
-
 static CONCENTRATE_PUMP_T concentratePumps[ NUM_OF_CONCENTRATE_PUMPS ];                                         ///< Array of concentrate pumps' data structure.
 static OVERRIDE_U32_T hasParkBeenRequested[ NUM_OF_CONCENTRATE_PUMPS ];                                         ///< Flag indicates a request to park the pump.
 static OVERRIDE_F32_T pumpTargetSpeed[ NUM_OF_CONCENTRATE_PUMPS ];                                              ///< Target concentrate pumps' speed (mL/min).
@@ -225,6 +223,11 @@
         isDosingCompleted[ pumpId ]                                 = FALSE;
     }
 
+    concentratePumpDataPublishInterval.data         = CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL;
+    concentratePumpDataPublishInterval.ovInitData   = CONCENTRATE_PUMP_DATA_PUBLISH_INTERVAL;
+    concentratePumpDataPublishInterval.ovData       = 0;
+    concentratePumpDataPublishInterval.override     = OVERRIDE_RESET;
+
     initPersistentAlarm( ALARM_ID_DD_D11_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DD_D10_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
     initPersistentAlarm( ALARM_ID_DD_D76_PUMP_SPEED_CONTROL_ERROR, 0, CONCENTRATE_PUMP_SPEED_OUT_OF_RANGE_TIMEOUT_MS );
Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc)
@@ -124,9 +124,7 @@
 // ********** private data **********
 
 static U32 dialysatePumpDataPublicationTimerCounter;                                                                ///< Used to schedule dialysate pump data publication to CAN bus.
-static OVERRIDE_U32_T dialysatePumpDataPublishInterval = { DIALYSATE_PUMP_DATA_PUB_INTERVAL,
-                                                           DIALYSATE_PUMP_DATA_PUB_INTERVAL,
-                                                           0, 0 };                                                  ///< Interval (in ms) at which to publish dialysate pump data to CAN bus.
+static OVERRIDE_U32_T dialysatePumpDataPublishInterval;                                                             ///< Interval (in ms) at which to publish dialysate pump data to CAN bus.
 
 //static DD_DIALYSATE_PUMP_CAL_RECORD_T dialysatePumpCalRecord;                                                     ///< Dialysate pump calibration record.
 static DIALYSATE_PUMP_DATA_T dialysatePumps[ NUM_OF_DIALYSATE_PUMPS ];                                              ///< Array of dialysate pumps data structure.
@@ -203,6 +201,11 @@
        signalDialysatePumpHardStop( pumpId );
     }
 
+    dialysatePumpDataPublishInterval.data         = DIALYSATE_PUMP_DATA_PUB_INTERVAL;
+    dialysatePumpDataPublishInterval.ovInitData   = DIALYSATE_PUMP_DATA_PUB_INTERVAL;
+    dialysatePumpDataPublishInterval.ovData       = 0;
+    dialysatePumpDataPublishInterval.override     = OVERRIDE_RESET;
+
     pumpTargetPressure[D12_PUMP].data             = DEFAULT_FRESH_DIALYSATE_TARGET_PRESSURE_PSI;
     pumpTargetPressure[D12_PUMP].ovInitData       = DEFAULT_FRESH_DIALYSATE_TARGET_PRESSURE_PSI;
     pumpTargetPressure[D12_PUMP].ovData           = 0.0F;
@@ -261,6 +264,7 @@
  *************************************************************************/
 static void calculateDegasPumpTargetPressure( void )
 {
+    //TODO: Uncomment below once baro reading available from TD.
     //F32 pressureInmmHg = getFilteredPressure( BARO_PRES );
 
     //Get the degassing target pressure
Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -r89f18a07a6d5837bf9b4559a69046e2b06f32c35 -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision 89f18a07a6d5837bf9b4559a69046e2b06f32c35)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc)
@@ -57,6 +57,7 @@
 } FILTER_CONDUCTIVITY_TEMPERATURE_READINGS_T;
 
 // ********** private data **********
+
 static FILTER_CONDUCTIVITY_READINGS_T filteredConductivityReadings[NUM_OF_CONDUCTIVITY_SENSORS];                        ///< Filtered conductivity reading for conductivity sensors.
 static OVERRIDE_F32_T filteredcurrentConductivityReadings[ NUM_OF_CONDUCTIVITY_SENSORS ];                               ///< filtered current conductivity sensor conductivity readings (overrideable).
 static FILTER_CONDUCTIVITY_TEMPERATURE_READINGS_T filteredConductivityTemperatureReadings[NUM_OF_CONDUCTIVITY_SENSORS]; ///< Filtered temperature reading for conductivity sensors.
Index: firmware/App/Monitors/Temperature.c
===================================================================
diff -u -r97ea48347859157d941d743deedb5b980b4c4594 -ra8b1004967be1c3bd4d46e96ff5886a0ec1446cc
--- firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision 97ea48347859157d941d743deedb5b980b4c4594)
+++ firmware/App/Monitors/Temperature.c	(.../Temperature.c)	(revision a8b1004967be1c3bd4d46e96ff5886a0ec1446cc)
@@ -168,6 +168,7 @@
 {
     SELF_TEST_STATUS_T result = SELF_TEST_STATUS_IN_PROGRESS;
 
+    //TODO: Uncomment below once Non volatile record is implemented.
     //BOOL calStatus = getNVRecord2Driver( GET_CAL_TEMP_SENSORS, (U08*)&tempSensorCalRecord, sizeof( DD_TEMP_SENSORS_CAL_RECORD_T ),
     //                                      NUM_OF_CAL_DATA_TEMP_SENSORS, ALARM_ID_DD_TEMPERATURE_SENSORS_INVALID_CAL_RECORD );
     BOOL calStatus = TRUE;