Index: Common.h
===================================================================
diff -u -r4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe -r87837a30c01ccd74d05bb77c734cbbc25a045202
--- Common.h	(.../Common.h)	(revision 4c8f5e8c8e26bb5c84859b4c846f3b583aae55fe)
+++ Common.h	(.../Common.h)	(revision 87837a30c01ccd74d05bb77c734cbbc25a045202)
@@ -34,7 +34,7 @@
 
 typedef float                    F32;               ///< 32-bit floating point type
 typedef double                   F64;               ///< 64-bit floating point type
-typedef unsigned long long       U64;               ///< 64-bit unsigned integer type
+typedef long long                S64;               ///< 64-bit signed integer type
 typedef unsigned int             U32;               ///< 32-bit unsigned integer type
 typedef int                      S32;               ///< 32-bit signed integer type
 typedef unsigned short           U16;               ///< 16-bit unsigned integer type
Index: NVDataMgmt.c
===================================================================
diff -u -r0164cd187647ce322bb19f5075387732af38d09a -r87837a30c01ccd74d05bb77c734cbbc25a045202
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 0164cd187647ce322bb19f5075387732af38d09a)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 87837a30c01ccd74d05bb77c734cbbc25a045202)
@@ -1753,7 +1753,7 @@
     PROCESS_RECORD_SPECS_T  jobSpecs = RECORDS_SPECS [ job ];
 
     // Check if the fapi has finished
-    if ( FAPI_CHECK_FSM_READY_BUSY == Fapi_Status_FsmReady )
+    if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
     {
         // Check the integrity of data (the 16 bytes that were written to EEPROM should be read and be checked for each byte)
         if ( writtenRecordStatus == NVDATAMGMT_RECORD_NOT_CHECKED )
@@ -1821,7 +1821,7 @@
     PROCESS_RECORD_SPECS_T jobSpecs = RECORDS_SPECS [ job ];
 
     // Check if the write job is EEPROM or RTC RAM
-    if ( recordCurrentJob.memoryLocation == NVDATAMGMT_EEPROM && FAPI_CHECK_FSM_READY_BUSY == Fapi_Status_FsmReady )
+    if ( recordCurrentJob.memoryLocation == NVDATAMGMT_EEPROM && Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY )
     {
         U32 i;
 
@@ -1899,7 +1899,7 @@
     NVDATAMGMT_EXEC_STATE_T state = NVDATAMGMT_EXEC_STATE_ERASE_EEPROM;
     BOOL timeoutStatus = didCommandTimeout ( ALARM_ID_NVDATA_EEPROM_OPS_FAILURE, (U08*)&state );
 
-    if ( FAPI_CHECK_FSM_READY_BUSY == Fapi_Status_FsmReady || timeoutStatus == TRUE )
+    if ( Fapi_Status_FsmReady == FAPI_CHECK_FSM_READY_BUSY || timeoutStatus == TRUE )
     {
         state = NVDATAMGMT_EXEC_STATE_IDLE;
     }
@@ -2621,7 +2621,7 @@
     {
         benignPolynomialCalRecord( record );
 
-        // Set the to FALSE since the record is not valid
+        // Set status to FALSE since the record is not valid
         status = FALSE;
     }
 
Index: PersistentAlarm.c
===================================================================
diff -u -r0164cd187647ce322bb19f5075387732af38d09a -r87837a30c01ccd74d05bb77c734cbbc25a045202
--- PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 0164cd187647ce322bb19f5075387732af38d09a)
+++ PersistentAlarm.c	(.../PersistentAlarm.c)	(revision 87837a30c01ccd74d05bb77c734cbbc25a045202)
@@ -341,6 +341,10 @@
         case FPGA_ERROR_ERROR:
             hasErrorOccured = ( alarmGroup->fpgaAlarmData[ errorType ].fpgaPreviousCount != fpgaCount ? TRUE : FALSE );
             break;
+
+        default:
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DG_SOFTWARE_FAULT, SW_FAULT_ID_INVALID_FPGA_ERROR_GROUP_SELECTED, errorType )
+            break;
     }
 
     if ( TRUE == hasErrorOccured )