diff --git a/misc/netconf.sh b/misc/netconf.sh
index d6a16b56e..7a0999eab 100755
--- a/misc/netconf.sh
+++ b/misc/netconf.sh
@@ -45,6 +45,7 @@ else
     ifconfig lo0 alias 127.0.0.18 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.0.19 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.0.20 netmask 255.255.255.255
+    ifconfig lo0 alias 127.0.0.50 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.0.200 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.0.201 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.0.202 netmask 255.255.255.255
@@ -70,6 +71,7 @@ else
     ifconfig lo0 alias 127.0.1.18 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.1.19 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.1.20 netmask 255.255.255.255
+    ifconfig lo0 alias 127.0.1.50 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.1.200 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.1.201 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.1.202 netmask 255.255.255.255
@@ -95,6 +97,7 @@ else
     ifconfig lo0 alias 127.0.2.18 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.2.19 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.2.20 netmask 255.255.255.255
+    ifconfig lo0 alias 127.0.2.50 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.2.200 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.2.201 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.2.202 netmask 255.255.255.255
@@ -120,6 +123,7 @@ else
     ifconfig lo0 alias 127.0.3.18 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.3.19 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.3.20 netmask 255.255.255.255
+    ifconfig lo0 alias 127.0.3.50 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.3.200 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.3.201 netmask 255.255.255.255
     ifconfig lo0 alias 127.0.3.202 netmask 255.255.255.255
diff --git a/src/amf/namf-build.c b/src/amf/namf-build.c
index 63bb8864a..f4721f306 100644
--- a/src/amf/namf-build.c
+++ b/src/amf/namf-build.c
@@ -126,8 +126,7 @@ ogs_sbi_request_t *amf_namf_comm_build_registration_status_update(
 
     memset(&UeRegStatusUpdateReqData, 0, sizeof(UeRegStatusUpdateReqData));
 
-    UeRegStatusUpdateReqData.transfer_status =
-        (OpenAPI_ue_context_transfer_status_e)data;
+    UeRegStatusUpdateReqData.transfer_status = OGS_POINTER_TO_UINT(data);
     /*
      * TS 29.518
      * 5.2.2.2.2 Registration Status Update
diff --git a/src/mme/esm-sm.c b/src/mme/esm-sm.c
index 290bfb536..d4575ded3 100644
--- a/src/mme/esm-sm.c
+++ b/src/mme/esm-sm.c
@@ -309,13 +309,13 @@ void esm_state_active(ogs_fsm_t *s, mme_event_t *e)
         ogs_assert(message);
 
         enb_ue = enb_ue_find_by_id(mme_ue->enb_ue_id);
-        ogs_assert(enb_ue);
 
         switch (message->esm.h.message_type) {
         case OGS_NAS_EPS_PDN_CONNECTIVITY_REQUEST:
             ogs_debug("PDN Connectivity request");
             ogs_debug("    IMSI[%s] PTI[%d] EBI[%d]",
                     mme_ue->imsi_bcd, sess->pti, bearer->ebi);
+            ogs_assert(enb_ue);
             rv = esm_handle_pdn_connectivity_request(
                     enb_ue, bearer, &message->esm.pdn_connectivity_request,
                     e->create_action);
@@ -330,6 +330,8 @@ void esm_state_active(ogs_fsm_t *s, mme_event_t *e)
             ogs_debug("PDN disconnect request");
             ogs_debug("    IMSI[%s] PTI[%d] EBI[%d]",
                     mme_ue->imsi_bcd, sess->pti, bearer->ebi);
+
+            ogs_assert(enb_ue);
             if (MME_HAVE_SGW_S1U_PATH(sess)) {
                 sgw_ue = sgw_ue_find_by_id(mme_ue->sgw_ue_id);
                 ogs_assert(sgw_ue);
@@ -371,6 +373,7 @@ void esm_state_active(ogs_fsm_t *s, mme_event_t *e)
             ogs_debug("Bearer resource allocation request");
             ogs_debug("    IMSI[%s] PTI[%d] EBI[%d]",
                     mme_ue->imsi_bcd, sess->pti, bearer->ebi);
+            ogs_assert(enb_ue);
             esm_handle_bearer_resource_allocation_request(
                     enb_ue, bearer, message);
             break;
@@ -378,6 +381,7 @@ void esm_state_active(ogs_fsm_t *s, mme_event_t *e)
             ogs_debug("Bearer resource modification request");
             ogs_debug("    IMSI[%s] PTI[%d] EBI[%d]",
                     mme_ue->imsi_bcd, sess->pti, bearer->ebi);
+            ogs_assert(enb_ue);
             esm_handle_bearer_resource_modification_request(
                     enb_ue, bearer, message);
             break;