Index: firmware/App/Modes/ModeTreatment.c
===================================================================
diff -u -rbdbb0ede1af201d43125d663a4ca5740e39509f6 -r39f3201d30dde0b55188c47239c683156aa36ca3
--- firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision bdbb0ede1af201d43125d663a4ca5740e39509f6)
+++ firmware/App/Modes/ModeTreatment.c	(.../ModeTreatment.c)	(revision 39f3201d30dde0b55188c47239c683156aa36ca3)
@@ -1100,8 +1100,8 @@
             txDurationRequest.newUFRateMLPM           = newUFRateMLPM;
             txDurationRequest.isUFRateConfInProgress  = TRUE;
 
-            genericConfRequest.requestID       = GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE;
-            genericConfRequest.requestType     = GENERIC_CONFIRM_CMD_REQUEST_OPEN;
+            genericConfRequest.requestID       = (U32)GENERIC_CONFIRM_ID_UF_RATE_CHANGE_IN_TX_DURATION_CHANGE;
+            genericConfRequest.requestType     = (U32)GENERIC_CONFIRM_CMD_REQUEST_OPEN;
             genericConfRequest.rejectReason    = 0;
             genericConfRequest.genericPayload1 = txDurationRequest.newUFRateMLPM;
             genericConfRequest.genericPayload2 = 0.0F;
Index: firmware/App/Modes/OperationModes.c
===================================================================
diff -u -rbdbb0ede1af201d43125d663a4ca5740e39509f6 -r39f3201d30dde0b55188c47239c683156aa36ca3
--- firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision bdbb0ede1af201d43125d663a4ca5740e39509f6)
+++ firmware/App/Modes/OperationModes.c	(.../OperationModes.c)	(revision 39f3201d30dde0b55188c47239c683156aa36ca3)
@@ -469,15 +469,15 @@
                 // Send UI clear
                 if ( CONFIRMATION_REQUEST_STATUS_TIMEOUT == status )
                 {
-                    genConfRqst.requestID   = confirmRequests[ i ].requestID;
-                    genConfRqst.requestType = GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE;
+                    genConfRqst.requestID   = (U32)confirmRequests[ i ].requestID;
+                    genConfRqst.requestType = (U32)GENERIC_CONFIRM_CMD_TIMEOUT_CLOSE;
 
                     sendConfirmationRequest( &genConfRqst );
                 }
                 else
                 {
-                    genConfRqst.requestID   = confirmRequests[ i ].requestID;
-                    genConfRqst.requestType = GENERIC_CONFIRM_CMD_ACCEPT_CLOSE;
+                    genConfRqst.requestID   = (U32)confirmRequests[ i ].requestID;
+                    genConfRqst.requestType = (U32)GENERIC_CONFIRM_CMD_ACCEPT_CLOSE;
 
                     sendConfirmationRequest( &genConfRqst );
                 }
@@ -509,8 +509,8 @@
 
     if ( ( CONFIRMATION_REQUEST_STATUS_PENDING != status ) && ( TRUE == pending ) )
     {
-        genConfRqst.requestID   = confirmRequests[ i ].requestID;
-        genConfRqst.requestType = confirmRequests[ pendingIndex ].requestType;
+        genConfRqst.requestID   = (U32)confirmRequests[ i ].requestID;
+        genConfRqst.requestType = (U32)confirmRequests[ pendingIndex ].requestType;
 
         // Last confirmation cleared, pending request must be resent to UI
         sendConfirmationRequest( &genConfRqst );
@@ -592,8 +592,8 @@
                 newID                            = requestID;
 
                 // Get ready for the generic confirmation request
-                genConfRqst.requestID   = requestID;
-                genConfRqst.requestType = requestType;
+                genConfRqst.requestID   = (U32)requestID;
+                genConfRqst.requestType = (U32)requestType;
 
                 sendConfirmationRequest( &genConfRqst );
                 break;
Index: firmware/App/Services/SystemCommMessages.h
===================================================================
diff -u -rbdbb0ede1af201d43125d663a4ca5740e39509f6 -r39f3201d30dde0b55188c47239c683156aa36ca3
--- firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision bdbb0ede1af201d43125d663a4ca5740e39509f6)
+++ firmware/App/Services/SystemCommMessages.h	(.../SystemCommMessages.h)	(revision 39f3201d30dde0b55188c47239c683156aa36ca3)
@@ -140,8 +140,8 @@
 /// Payload structure for generic confirmation request
 typedef struct
 {
-    GENERIC_CONFIRM_ID_T requestID;             ///< Generic request ID.
-    GENERIC_CONFIRM_COMMAND_T requestType;      ///< Generic request type.
+    U32 requestID;                              ///< Generic request ID.
+    U32 requestType;                            ///< Generic request type.
     U32 rejectReason;                           ///< Reject reason.
     F32 genericPayload1;                        ///< Generic payload 1.
     F32 genericPayload2;                        ///< Generic payload 2.