Index: firmware/App/Controllers/BloodLeak.c
===================================================================
diff -u -r62cbfbbd0d1baa7b1f383510b7864921e2dfd054 -r03843cd217e3beaa24f7ff17a892a44d05b43734
--- firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 62cbfbbd0d1baa7b1f383510b7864921e2dfd054)
+++ firmware/App/Controllers/BloodLeak.c	(.../BloodLeak.c)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
@@ -152,7 +152,7 @@
     if ( TRUE == isNewCalibrationRecordAvailable() )
     {
         U32 length = sizeof( HD_BLOOD_LEAK_SENSOR_CAL_RECORD_T );
-        getCalibrationRecord2Driver( GET_CAL_BLOOD_LEAK_SENSOR, (U08*)&bloodLeakCalRecord, length, ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD );
+        getNVRecord2Driver( GET_CAL_BLOOD_LEAK_SENSOR, (U08*)&bloodLeakCalRecord, length, 0, ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD );
         prepareSetPointSeq();
 
         // Force the state machine to go back to set the set point that has been received from
@@ -230,7 +230,7 @@
 
     U32 length       = sizeof( HD_BLOOD_LEAK_SENSOR_CAL_RECORD_T );
     ALARM_ID_T alarm = ALARM_ID_HD_BLOOD_LEAK_INVALID_CAL_RECORD;
-    BOOL calStatus   = getCalibrationRecord2Driver( GET_CAL_BLOOD_LEAK_SENSOR, (U08*)&bloodLeakCalRecord, length, alarm );
+    BOOL calStatus   = getNVRecord2Driver( GET_CAL_BLOOD_LEAK_SENSOR, (U08*)&bloodLeakCalRecord, length, 0, alarm );
 
     if ( TRUE == calStatus )
     {
Index: firmware/App/Services/AlarmMgmt.c
===================================================================
diff -u -r2c9bbece8057254f8389c26a818081002fb69a77 -r03843cd217e3beaa24f7ff17a892a44d05b43734
--- firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 2c9bbece8057254f8389c26a818081002fb69a77)
+++ firmware/App/Services/AlarmMgmt.c	(.../AlarmMgmt.c)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
@@ -340,8 +340,10 @@
         ALARM_TRIGGERED_PAYLOAD_T data;
 
         data.alarm = (U32)alarm;
-        data.almData1 = alarmData1;
-        data.almData2 = alarmData2;
+        data.almDataType1 = (U32)alarmData1.dataType;
+        data.almData1 = alarmData1.data.uInt.data;
+        data.almDataType2 = (U32)alarmData2.dataType;
+        data.almData2 = alarmData2.data.uInt.data;
 
         broadcastData( MSG_ID_ALARM_TRIGGERED, COMM_BUFFER_OUT_CAN_HD_ALARM, (U08*)&data, sizeof( ALARM_TRIGGERED_PAYLOAD_T ) );
         // Send information for UI to log to treatment log
Index: firmware/App/Services/AlarmMgmt.h
===================================================================
diff -u -r09e6cf9de34acf18f6e1138bf56ac0edb4821186 -r03843cd217e3beaa24f7ff17a892a44d05b43734
--- firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 09e6cf9de34acf18f6e1138bf56ac0edb4821186)
+++ firmware/App/Services/AlarmMgmt.h	(.../AlarmMgmt.h)	(revision 03843cd217e3beaa24f7ff17a892a44d05b43734)
@@ -132,8 +132,10 @@
 typedef struct
 {
     U32 alarm;                      ///< ID of alarm that was triggered
-    ALARM_DATA_T almData1;          ///< Supporting data #1
-    ALARM_DATA_T almData2;          ///< Supporting data #2
+    U32 almDataType1;               ///< Supporting data type #1
+    U32 almData1;                   ///< Supporting data #1
+    U32 almDataType2;               ///< Supporting data type #2
+    U32 almData2;                   ///< Supporting data #2
 } ALARM_TRIGGERED_PAYLOAD_T;
 
 #pragma pack(pop)