Index: NVDataMgmt.c
===================================================================
diff -u -ra5ba573ba517926bb1dc49f42b0284cef69d613d -r6c1ae9d2ca0543a0e84e20d43690d57b6a2a8322
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision a5ba573ba517926bb1dc49f42b0284cef69d613d)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 6c1ae9d2ca0543a0e84e20d43690d57b6a2a8322)
@@ -8,7 +8,7 @@
 * @file    NVDataMgmt.c
 *
 * @author  (last)      Dara Navaei
-* @date    (last)      09-Nov-2022
+* @date    (last)      21-Dec-2022
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  12-Feb-2020
@@ -1305,6 +1305,8 @@
         // Both the usage and service records have been updated
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_USAGE_INFO_RECORD ].nvEvent, 0, 0 )
         SEND_EVENT_WITH_2_U32_DATA( RECORDS_SPECS[ NVDATAMGMT_SERVICE_RECORD ].nvEvent, 0, 0 )
+
+        status = TRUE;
     }
 
     return status;
@@ -1617,30 +1619,30 @@
 
         case NVDATAMGMT_SYSTEM_RECORD:
 #ifdef _DG_
-            dgSystemGroup.crc = crc;
+            dgSystemGroup.dgSystemRecord.crc = crc;
 #endif
 #ifdef _HD_
-            hdSystemGroup.crc = crc;
+            hdSystemGroup.hdsystemRecord.crc = crc;
 #endif
             status = enqueueSector0Records();
             break;
 
         case NVDATAMGMT_SERVICE_RECORD:
 #ifdef _DG_
-            dgServiceGroup.crc = crc;
+            dgServiceGroup.dgServiceRecord.crc = crc;
 #endif
 #ifdef _HD_
-            hdServiceGroup.crc = crc;
+            hdServiceGroup.hdServiceRecord.crc = crc;
 #endif
             status = enqueueSector0Records();
             break;
 
         case NVDATAMGMT_USAGE_INFO_RECORD:
 #ifdef _DG_
-            dgUsageInfoGroup.crc = crc;
+            dgUsageInfoGroup.dgUsageInfo.crc = crc;
 #endif
 #ifdef _HD_
-            hdUsageInfoGroup.crc = crc;
+            hdUsageInfoGroup.hdUsageInfo.crc = crc;
 #endif
             if ( getAvailableRecordQueueCount() > 0 )
             {