Index: NVDataMgmt.c
===================================================================
diff -u -r5072f6150977593c7a73abb4afac386d46081ee3 -reb133bc728b96fda709740f61b5dc22eae9ac5c9
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 5072f6150977593c7a73abb4afac386d46081ee3)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision eb133bc728b96fda709740f61b5dc22eae9ac5c9)
@@ -81,7 +81,7 @@
 #define DG_HEATERS_INFO_START_ADDRESS        (DG_SCHEDULED_RUNS_START_ADDRESS + sizeof(DG_HEATERS_INFO_GROUP_T))///< DG heaters info start address in RTC RAM.
 #define SW_CONFIGS_START_ADDRESS             0x00000100 // 256                                                  ///< Software configurations start address in RTC RAM.
 
-#define COMMAND_TIME_OUT                     500U                                                               ///< Timeout for an EEPROM or RTC command in ms.
+#define COMMAND_TIME_OUT                     (1 * MS_PER_SECOND)                                                ///< Timeout for an EEPROM or RTC command in ms.
 /// EEPROM functions use the buffer length as the size of U32. So before send the length to any of FAPI functions, it should be divided by 4.
 #define EEPROM_OPS_SIZE_OF_CONVERTER         4
 
@@ -121,8 +121,8 @@
 
 // HD specific defines
 #ifdef _HD_
-#define BLOOD_LEAK_DEFAULT_SET_POINT         20                                                                 ///< Blood leak default set point.
-#define HEPARIN_PUMP_DEFAULT_VOLTAGE         0.15F                                                              ///< Heparin pump default voltage.
+#define DEFAULT_BLOOD_LEAK_SET_POINT         20                                                                 ///< Blood leak default set point.
+#define DEFAULT_HEPARIN_PUMP_VOLTAGE         0.15F                                                              ///< Heparin pump default voltage.
 #endif
 
 // DG specific defines
@@ -450,7 +450,7 @@
 const PROCESS_RECORD_SPECS_T RECORDS_SPECS [ NUM_OF_NVDATMGMT_RECORDS_JOBS ] =  {
   {CAL_RECORD_NV_MEM_START_ADDRESS,     sizeof(HD_CALIBRATION_RECORD_T), MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_CALIBRATION_RECORD_T), (U08*)&hdCalibrationRecord, (U08*)&hdCalibrationRecord.crc, NVDATAMGMT_EEPROM},            // NVDATAMGMT_CALIBRATION_RECORD
   {SYSTEM_RECORD_NV_MEM_START_ADDRESS,  sizeof(HD_SYSTEM_GROUP_T),       MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SYSTEM_GROUP_T),       (U08*)&hdSystemGroup,       (U08*)&hdSystemGroup.crc,       NVDATAMGMT_EEPROM},            // NVDATAMGMT_SYSTEM_RECORD
-  {SERVICE_RECORD_NV_MEM_START_ADDRESS, sizeof(HD_SERVICE_GROUP_T),      MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SERVICE_GROUP_T),      (U08*)&hdServiceGroup,      (U08*)&hdServiceGroup.crc,      NVDATAMGMT_RTC},               // NVDATAMGMT_PROCESS_LAST_SERVICE_RECORD
+  {SERVICE_RECORD_NV_MEM_START_ADDRESS, sizeof(HD_SERVICE_GROUP_T),      MAX_EEPROM_WRITE_BUFFER_BYTES, sizeof(HD_SERVICE_GROUP_T),      (U08*)&hdServiceGroup,      (U08*)&hdServiceGroup.crc,      NVDATAMGMT_EEPROM},            // NVDATAMGMT_PROCESS_LAST_SERVICE_RECORD
 #ifndef _RELEASE_
   {SW_CONFIGS_START_ADDRESS,            sizeof(HD_SW_CONFIG_GROUP_T),    MAX_RTC_RAM_OPS_BUFFER_BYTES,  MAX_RTC_RAM_OPS_BUFFER_BYTES,    (U08*)&hdSWConfigGroup,     (U08*)&hdSWConfigGroup.crc,     NVDATAMGMT_RTC},               // NVDATAMGMT_SW_CONFIG_RECORD
 #endif
@@ -3618,7 +3618,7 @@
 
     if ( calcCRC != recordCRC )
     {
-        record->setPoint        = BLOOD_LEAK_DEFAULT_SET_POINT;
+        record->setPoint        = DEFAULT_BLOOD_LEAK_SET_POINT;
         record->calibrationTime = RECORD_DEFAULT_TIME;
         record->crc             = crc16 ( (U08*)record, sizeof( HD_BLOOD_LEAK_SENSOR_CAL_RECORD_T ) - sizeof( U16 ) );
 
@@ -3646,7 +3646,7 @@
 
     if ( calcCRC != recordCRC )
     {
-        record->hdHeparinForceSensorDACVoltage = HEPARIN_PUMP_DEFAULT_VOLTAGE;
+        record->hdHeparinForceSensorDACVoltage = DEFAULT_HEPARIN_PUMP_VOLTAGE;
         record->calibrationTime                = RECORD_DEFAULT_TIME;
         record->crc                            = crc16 ( (U08*)record, sizeof( HD_HEPARIN_FORCE_SENSOR_CAL_RECORD_T ) - sizeof( U16 ) );
 
Index: Utilities.c
===================================================================
diff -u -r5072f6150977593c7a73abb4afac386d46081ee3 -reb133bc728b96fda709740f61b5dc22eae9ac5c9
--- Utilities.c	(.../Utilities.c)	(revision 5072f6150977593c7a73abb4afac386d46081ee3)
+++ Utilities.c	(.../Utilities.c)	(revision eb133bc728b96fda709740f61b5dc22eae9ac5c9)
@@ -656,7 +656,12 @@
  *************************************************************************/
 void initSemaphores( void )
 {
-    memset( &sempahoreStatus, FALSE, sizeof( SEMAPHORE_STATUS_T ) );
+    U08 i;
+
+    for ( i = 0; i < NUM_OF_SEMAPHORES; i++ )
+    {
+        memset( &sempahoreStatus[ i ], 0x0, sizeof( SEMAPHORE_STATUS_T ) );
+    }
 }
 
 /*********************************************************************//**
@@ -684,7 +689,7 @@
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
 #endif
 #ifdef _HD_
-        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_SEMAPHORE_IN_USE_TIMEOUT, (U32)s )
 #endif
     }
     _enable_IRQ();