Index: NVDataMgmt.c
===================================================================
diff -u -ra81f873d234c5eb7706fbe4dd2f0be3e934909d5 -rd136ddf60da3be5d1e1bb83af7221927f4cfea25
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision a81f873d234c5eb7706fbe4dd2f0be3e934909d5)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision d136ddf60da3be5d1e1bb83af7221927f4cfea25)
@@ -131,7 +131,7 @@
 #define ACID_CONC_DEFAULT_MIXING_RATIO            ( 2.35618 / FRACTION_TO_PERCENT_FACTOR )                      ///< Ratio between RO water and acid concentrate mixing ratio.
 #define BICARB_CONC_DEFAULT_MIXING_RATIO          ( 4.06812 / FRACTION_TO_PERCENT_FACTOR )                      ///< Ratio between RO water and bicarbonate concentrate mixing ratio.
 #define PRES_SENSORS_RESERVED_SPACE_COUNT         6                                                             ///< Pressure sensors reserved space count.
-#define FLOW_SENSROS_RESERVED_SPACE_COUNT         3                                                             ///< Flow sensors reserved space count.
+#define FLOW_SENSROS_RESERVED_SPACE_COUNT         2                                                             ///< Flow sensors reserved space count.
 #define TEMP_SENSORS_RESERVED_SPACE_COUNT         5                                                             ///< Temperature sensors reserved space count.
 #define COND_SENSORS_RESERVED_SPACE_COUNT         2                                                             ///< Conductivity sensors reserved space count.
 #define GENERIC_VOL_RESERVED_SPACE_COUNT          4                                                             ///< Generic volumes reserved space count.
@@ -2960,8 +2960,10 @@
     }
 
     for ( i = 0; i < PRES_SENSORS_RESERVED_SPACE_COUNT; i++ )
+    {
         // Benign the pressures reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&pressure->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
+    }
 
     DG_FLOW_SENSORS_CAL_RECORD_T* flow = &dgCalibrationRecord.dgCalibrationGroups.flowSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_FLOW_SENSORS; i++ )
@@ -2972,8 +2974,10 @@
     }
 
     for ( i = 0; i < FLOW_SENSROS_RESERVED_SPACE_COUNT; i++ )
+    {
         // Benign the the flow sensors reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&flow->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
+    }
 
     DG_LOAD_CELLS_CAL_RECORD_T* load = &dgCalibrationRecord.dgCalibrationGroups.loadCellsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_LOAD_CELLS; i++ )
@@ -2992,8 +2996,10 @@
     }
 
     for ( i = 0; i < TEMP_SENSORS_RESERVED_SPACE_COUNT; i++ )
+    {
         // Benign the temperature sensors reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&temperature->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
+    }
 
     DG_COND_SENSORS_CAL_RECORD_T* cond = &dgCalibrationRecord.dgCalibrationGroups.condSensorsCalRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_COND_SENSORS; i++ )
@@ -3004,8 +3010,10 @@
     }
 
     for ( i = 0; i < COND_SENSORS_RESERVED_SPACE_COUNT; i++ )
+    {
         // Benign the conductivity sensors reserved spaces
         memcpy( (POLYNOMIAL_CAL_PAYLOAD_T*)&cond->reservedSpace[ i ], &tempRecord, sizeof( POLYNOMIAL_CAL_PAYLOAD_T ) );
+    }
 
     DG_CONC_PUMPS_CAL_RECORD_T* concPump = &dgCalibrationRecord.dgCalibrationGroups.concentratePumpsRecord;
     for ( i = 0; i < NUM_OF_CAL_DATA_DG_CONC_PUMPS; i++ )