Index: NVDataMgmt.c
===================================================================
diff -u -r3208a0fc3816ad6f54e88301b7dd2913ce17044b -r106bbf14432e48c0153ede862800fc3722935ede
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3208a0fc3816ad6f54e88301b7dd2913ce17044b)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 106bbf14432e48c0153ede862800fc3722935ede)
@@ -43,7 +43,7 @@
 #define QUEUE_MAX_SIZE                       20U                                                                ///< Max queue size.
 #define QUEUE_START_INDEX                    0U                                                                 ///< Queue start index.
 #define MIN_JOBS_NEEDED_FOR_DATA_LOG         3U                                                                 ///< Min queue required for data log (3).
-#define MIN_JOBS_NEEDED_FOR_SECTOR_0         4U                                                                 ///< Min queue count needed to write all (4) records back in sector 0.
+#define MIN_JOBS_NEEDED_FOR_SECTOR_0         5U                                                                 ///< Min queue count needed to erase and write all (5) records back in sector 0.
 #define MAX_NUM_OF_WRITE_TRIES               3U                                                                 ///< Max number of write tries.
 
 // The clock frequency comes from HCLK_FREQ and it has to be rounded up to the nearest number
@@ -3840,31 +3840,31 @@
     if ( calcCRC != recordCRC )
     {
         // CRC did not pass so set all values to default
-        hdInstitutionalGroup.hdInstitutionalRecord.minBloodFlowMLPM              = DEFAULT_MIN_BLOOD_FLOW_MLPM;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxBloodFlowMLPM              = DEFAULT_MAX_BLOOD_FLOW_MLPM;
-        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateFlowMLPM          = DEFAULT_MIN_DIALYSATE_FLOW_MLPM;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateFlowMLPM          = DEFAULT_MAX_DIALYSATE_FLOW_MLPM;
-        hdInstitutionalGroup.hdInstitutionalRecord.minTxDurationMin              = DEFAULT_MIN_TX_DURATION_MIN;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxTxDurationMin              = DEFAULT_MAX_TX_DURATION_MIN;
-        hdInstitutionalGroup.hdInstitutionalRecord.heparinEnable                 = DEFAULT_HEPARIN_ENABLE;
-        hdInstitutionalGroup.hdInstitutionalRecord.minStopHeparinDispBeforeTxEnd = DEFAULT_MIN_STOP_HEP_DISP_BEFORE_TX_END;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxStopHeparinDispBeforeTxEnd = DEFAULT_MAX_STOP_HEP_DISP_BEFORE_TX_END;
-        hdInstitutionalGroup.hdInstitutionalRecord.minSalineBolusVolumeML        = DEFAULT_MIN_SALINE_BOLUS_VOLUME_ML;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxSalineBolusVolumeML        = DEFAULT_MAX_SALINE_BOLUS_VOLUME_ML;
-        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateTempC             = DEFAULT_MIN_DIALYSATE_TEMPERATURE_C;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateTempC             = DEFAULT_MAX_DIALYSATE_TEMPERATURE_C;
-        hdInstitutionalGroup.hdInstitutionalRecord.minArtPressLimitWindowMMHG    = DEFAULT_MIN_ART_PRESS_LIMIT_WINDOW_MMHG;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxArtPressLimitWindowMMHG    = DEFAULT_MAX_ART_PRESS_LIMIT_WINDOW_MMHG;
-        hdInstitutionalGroup.hdInstitutionalRecord.minVenPressLimitWindowMMHG    = DEFAULT_MIN_VEN_PRESS_LIMIT_WINDOW_MMHG;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxVenPressLimitWindowMMHG    = DEFAULT_MAX_VEN_PRESS_LIMIT_WINDOW_MMHG;
-        hdInstitutionalGroup.hdInstitutionalRecord.minVenAsymPressLimitMMHG      = DEFAULT_MIN_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxVenAsymPressLimitMMHG      = DEFAULT_MAX_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG;
-        hdInstitutionalGroup.hdInstitutionalRecord.minUFVolumeML                 = DEFAULT_MIN_UF_VOLUME_ML;
-        hdInstitutionalGroup.hdInstitutionalRecord.maxUFVolumeML                 = DEFAULT_MAX_UF_VOLUME_ML;
-        hdInstitutionalGroup.hdInstitutionalRecord.crc                           = crc16 ( (U08*)&hdInstitutionalGroup.hdInstitutionalRecord,
-                                                                                           sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U16 ) );
-        hdInstitutionalGroup.crc                                                 = crc16 ( (U08*)&hdInstitutionalGroup, sizeof( HD_INSTITUTIONAL_GROUP_T ) - sizeof( U16 ) );
-        status                                                                   = FALSE;
+        hdInstitutionalGroup.hdInstitutionalRecord.minBloodFlowMLPM                 = DEFAULT_MIN_BLOOD_FLOW_MLPM;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxBloodFlowMLPM                 = DEFAULT_MAX_BLOOD_FLOW_MLPM;
+        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateFlowMLPM             = DEFAULT_MIN_DIALYSATE_FLOW_MLPM;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateFlowMLPM             = DEFAULT_MAX_DIALYSATE_FLOW_MLPM;
+        hdInstitutionalGroup.hdInstitutionalRecord.minTxDurationMIN                 = DEFAULT_MIN_TX_DURATION_MIN;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxTxDurationMIN                 = DEFAULT_MAX_TX_DURATION_MIN;
+        hdInstitutionalGroup.hdInstitutionalRecord.heparinEnable                    = DEFAULT_HEPARIN_ENABLE;
+        hdInstitutionalGroup.hdInstitutionalRecord.minStopHeparinDispBeforeTxEndMIN = DEFAULT_MIN_STOP_HEP_DISP_BEFORE_TX_END_MIN;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxStopHeparinDispBeforeTxEndMIN = DEFAULT_MAX_STOP_HEP_DISP_BEFORE_TX_END_MIN;
+        hdInstitutionalGroup.hdInstitutionalRecord.minSalineBolusVolumeML           = DEFAULT_MIN_SALINE_BOLUS_VOLUME_ML;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxSalineBolusVolumeML           = DEFAULT_MAX_SALINE_BOLUS_VOLUME_ML;
+        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateTempC                = DEFAULT_MIN_DIALYSATE_TEMPERATURE_C;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateTempC                = DEFAULT_MAX_DIALYSATE_TEMPERATURE_C;
+        hdInstitutionalGroup.hdInstitutionalRecord.minArtPressLimitWindowMMHG       = DEFAULT_MIN_ART_PRESS_LIMIT_WINDOW_MMHG;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxArtPressLimitWindowMMHG       = DEFAULT_MAX_ART_PRESS_LIMIT_WINDOW_MMHG;
+        hdInstitutionalGroup.hdInstitutionalRecord.minVenPressLimitWindowMMHG       = DEFAULT_MIN_VEN_PRESS_LIMIT_WINDOW_MMHG;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxVenPressLimitWindowMMHG       = DEFAULT_MAX_VEN_PRESS_LIMIT_WINDOW_MMHG;
+        hdInstitutionalGroup.hdInstitutionalRecord.minVenAsymPressLimitMMHG         = DEFAULT_MIN_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxVenAsymPressLimitMMHG         = DEFAULT_MAX_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG;
+        hdInstitutionalGroup.hdInstitutionalRecord.minUFVolumeL                     = DEFAULT_MIN_UF_VOLUME_L;
+        hdInstitutionalGroup.hdInstitutionalRecord.maxUFVolumeL                     = DEFAULT_MAX_UF_VOLUME_L;
+        hdInstitutionalGroup.hdInstitutionalRecord.crc                              = crc16 ( (U08*)&hdInstitutionalGroup.hdInstitutionalRecord,
+                                                                                              sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U16 ) );
+        hdInstitutionalGroup.crc                                                    = crc16 ( (U08*)&hdInstitutionalGroup, sizeof( HD_INSTITUTIONAL_GROUP_T ) - sizeof( U16 ) );
+        status                                                                      = FALSE;
 
         // Institutional record failure is also considered as RTC RAM failure
         activateAlarmNoData( ALARM_ID_HD_INVALID_INSTITUTIONAL_RECORD_CRC );
Index: NVDataMgmtHDRecords.h
===================================================================
diff -u -rd22ac2e16310e6ac50119305805af0aa9a5447d8 -r106bbf14432e48c0153ede862800fc3722935ede
--- NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision d22ac2e16310e6ac50119305805af0aa9a5447d8)
+++ NVDataMgmtHDRecords.h	(.../NVDataMgmtHDRecords.h)	(revision 106bbf14432e48c0153ede862800fc3722935ede)
@@ -43,8 +43,8 @@
 #define DEFAULT_MIN_TX_DURATION_MIN                  60
 #define DEFAULT_MAX_TX_DURATION_MIN                  480
 #define DEFAULT_HEPARIN_ENABLE                       1
-#define DEFAULT_MIN_STOP_HEP_DISP_BEFORE_TX_END      0
-#define DEFAULT_MAX_STOP_HEP_DISP_BEFORE_TX_END      480
+#define DEFAULT_MIN_STOP_HEP_DISP_BEFORE_TX_END_MIN  0
+#define DEFAULT_MAX_STOP_HEP_DISP_BEFORE_TX_END_MIN  480
 #define DEFAULT_MIN_SALINE_BOLUS_VOLUME_ML           100
 #define DEFAULT_MAX_SALINE_BOLUS_VOLUME_ML           300
 #define DEFAULT_MIN_DIALYSATE_TEMPERATURE_C          35.0F
@@ -55,8 +55,8 @@
 #define DEFAULT_MAX_VEN_PRESS_LIMIT_WINDOW_MMHG      200
 #define DEFAULT_MIN_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG 20
 #define DEFAULT_MAX_VEN_ASYM_PRESS_LIMIT_WINDOW_MMHG 35
-#define DEFAULT_MIN_UF_VOLUME_ML                     0
-#define DEFAULT_MAX_UF_VOLUME_ML                     8
+#define DEFAULT_MIN_UF_VOLUME_L                      0.0F
+#define DEFAULT_MAX_UF_VOLUME_L                      8.0F
 
 #ifndef _RELEASE_
 /// Software configuration enums
@@ -296,11 +296,11 @@
     U32 maxBloodFlowMLPM;
     U32 minDialysateFlowMLPM;
     U32 maxDialysateFlowMLPM;
-    U32 minTxDurationMin;
-    U32 maxTxDurationMin;
+    U32 minTxDurationMIN;
+    U32 maxTxDurationMIN;
     U32 heparinEnable;
-    U32 minStopHeparinDispBeforeTxEnd;
-    U32 maxStopHeparinDispBeforeTxEnd;
+    U32 minStopHeparinDispBeforeTxEndMIN;
+    U32 maxStopHeparinDispBeforeTxEndMIN;
     U32 minSalineBolusVolumeML;
     U32 maxSalineBolusVolumeML;
     F32 minDialysateTempC;
@@ -311,8 +311,8 @@
     U32 maxVenPressLimitWindowMMHG;
     U32 minVenAsymPressLimitMMHG;
     U32 maxVenAsymPressLimitMMHG;
-    U32 minUFVolumeML;
-    U32 maxUFVolumeML;
+    F32 minUFVolumeL;
+    F32 maxUFVolumeL;
     U32 calibrationTime;
     U16 crc;
 } HD_INSTITUTIONAL_RECORD_T;