diff --git a/openair2/COMMON/as_message.h b/openair2/COMMON/as_message.h
index bee19193934dd04074e941541a1b16b2acbbedf7..5d8419448533831562a14df5f57aee68b9732ca9 100644
--- a/openair2/COMMON/as_message.h
+++ b/openair2/COMMON/as_message.h
@@ -346,6 +346,8 @@ typedef struct nas_establish_rsp_s {
     nas_error_code_t errCode;      /* Transaction status          */
     as_nas_info_t    nasMsg;       /* NAS message to transfer     */
     UInt32_t         nas_ul_count; /* UL NAS COUNT                */
+    uint16_t         selected_encryption_algorithm;
+    uint16_t         selected_integrity_algorithm;
 } nas_establish_rsp_t;
 
 /*
@@ -357,6 +359,8 @@ typedef struct nas_establish_cnf_s {
     nas_error_code_t errCode;         /* Transaction status          */
     as_nas_info_t    nasMsg;          /* NAS message to transfer     */
     UInt32_t         ul_nas_count;
+    uint16_t         selected_encryption_algorithm;
+    uint16_t         selected_integrity_algorithm;
 } nas_establish_cnf_t;
 
 /*
diff --git a/openair2/COMMON/networkDef.h b/openair2/COMMON/networkDef.h
index 9a00e12d8ad9e660b5e06904ad488217883465e7..06e7cf655c18ededa1dc7f1498fb7591456a7c0c 100644
--- a/openair2/COMMON/networkDef.h
+++ b/openair2/COMMON/networkDef.h
@@ -148,9 +148,9 @@ Description Contains network's global definitions
  * PDN connection type
  * -------------------
  */
-#define NET_PDN_TYPE_IPV4   0
-#define NET_PDN_TYPE_IPV6   1
-#define NET_PDN_TYPE_IPV4V6 2
+#define NET_PDN_TYPE_IPV4   (0 + 1)
+#define NET_PDN_TYPE_IPV6   (1 + 1)
+#define NET_PDN_TYPE_IPV4V6 (2 + 1)
 
 /****************************************************************************/
 /************************  G L O B A L    T Y P E S  ************************/