diff --git a/srsenb/src/upper/rrc.cc b/srsenb/src/upper/rrc.cc
index de1c61b9e..03ea65f2c 100644
--- a/srsenb/src/upper/rrc.cc
+++ b/srsenb/src/upper/rrc.cc
@@ -314,12 +314,11 @@ void rrc::release_complete(uint16_t rnti)
     if (!users[rnti].is_idle()) {
       rlc->clear_buffer(rnti); 
       users[rnti].send_connection_release();
-      // There is no RRCReleaseComplete message from UE thus sleep to enable all retx in PHY +50%
-      usleep(1500*8*cfg.mac_cnfg.ulsch_cnfg.max_harq_tx);
+      // There is no RRCReleaseComplete message from UE thus wait ~100 subframes for tx
+      usleep(100000);
     }
     rem_user(rnti);
   } else {
-    
     rrc_log->error("Received ReleaseComplete for unknown rnti=0x%x\n", rnti);
   }
 }
diff --git a/srsenb/src/upper/s1ap.cc b/srsenb/src/upper/s1ap.cc
index 9328060e6..eba9186e7 100644
--- a/srsenb/src/upper/s1ap.cc
+++ b/srsenb/src/upper/s1ap.cc
@@ -594,7 +594,7 @@ bool s1ap::handle_uectxtreleasecommand(LIBLTE_S1AP_MESSAGE_UECONTEXTRELEASECOMMA
     s1ap_log->warning("Not handling S1AP message extension\n");
   }
 
-  uint16_t rnti;
+  uint16_t rnti = 0;
   if(msg->UE_S1AP_IDs.choice_type == LIBLTE_S1AP_UE_S1AP_IDS_CHOICE_UE_S1AP_ID_PAIR) {
 
     if(msg->UE_S1AP_IDs.choice.uE_S1AP_ID_pair.ext) {