Index: NVDataMgmt.c
===================================================================
diff -u -r4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe -r270130c42c81fb5f314e32cfde171c889cd70d6a
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 270130c42c81fb5f314e32cfde171c889cd70d6a)
@@ -3393,7 +3393,7 @@
         hdSystemGroup.hdsystemRecord.mfgDate     = 0;
         hdSystemGroup.hdsystemRecord.mfgLocation = 0;
         memset( hdSystemGroup.hdsystemRecord.topLevelPN, RECORD_DEFAULT_CHARACTER, sizeof( hdSystemGroup.hdsystemRecord.topLevelPN ) );
-        memset( hdSystemGroup.hdsystemRecord.topLevelPN, RECORD_DEFAULT_CHARACTER, sizeof( hdSystemGroup.hdsystemRecord.topLevelPN ) );
+        memset( hdSystemGroup.hdsystemRecord.topLevelSN, RECORD_DEFAULT_CHARACTER, sizeof( hdSystemGroup.hdsystemRecord.topLevelSN ) );
         // Recalculate the CRC with the default values
         hdSystemGroup.hdsystemRecord.crc          = crc16 ( (U08*)&hdSystemGroup.hdsystemRecord, sizeof( HD_SYSTEM_RECORD_T ) - sizeof( U16 ) );
 
Index: PersistentAlarm.c
===================================================================
diff -u -r4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe -r270130c42c81fb5f314e32cfde171c889cd70d6a
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 270130c42c81fb5f314e32cfde171c889cd70d6a)
@@ -304,7 +304,12 @@
     }
     else
     {
+#ifdef _DG_
         SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group );
+#endif
+#ifdef _HD_
+        SET_ALARM_WITH_2_U32_DATA( ALARM_ID_HD_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_SENSOR_GROUP_SELECTED, (U32)group );
+#endif
     }
 }