diff --git a/lib/src/asn1/liblte_s1ap.cc b/lib/src/asn1/liblte_s1ap.cc
index 31c7391ab..530767c2f 100644
--- a/lib/src/asn1/liblte_s1ap.cc
+++ b/lib/src/asn1/liblte_s1ap.cc
@@ -2243,6 +2243,12 @@ LIBLTE_ERROR_ENUM liblte_s1ap_pack_imsi(
   if(ie  != NULL &&
      ptr != NULL)
   {
+    // max length of IE buffer is 32, so limit
+    if (ie->n_octets > 31) {
+      printf("Length in struct exceeds buffer (%d > 31).\n", ie->n_octets);
+      return LIBLTE_ERROR_ENCODE_FAIL;
+    }
+
     // Dynamic octet string - IMSI
     // Length
     if(ie->n_octets < 128) {
diff --git a/lib/src/phy/resampling/resample_arb.c b/lib/src/phy/resampling/resample_arb.c
index 441e8c0dc..5cea28ed2 100644
--- a/lib/src/phy/resampling/resample_arb.c
+++ b/lib/src/phy/resampling/resample_arb.c
@@ -150,7 +150,7 @@ int srslte_resample_arb_compute(srslte_resample_arb_t *q, cf_t *input, cf_t *out
     
     res1 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[idx], SRSLTE_RESAMPLE_ARB_M);
     if(q->interpolate){
-      res2 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[(idx%SRSLTE_RESAMPLE_ARB_N)+1], SRSLTE_RESAMPLE_ARB_M);
+      res2 = srslte_resample_arb_dot_prod(filter_input, srslte_resample_arb_polyfilt[(idx+1)%SRSLTE_RESAMPLE_ARB_N], SRSLTE_RESAMPLE_ARB_M);
     }
 
     if(idx == SRSLTE_RESAMPLE_ARB_N){
diff --git a/srsenb/src/mac/ue.cc b/srsenb/src/mac/ue.cc
index 4b6b69e3b..166be24f1 100644
--- a/srsenb/src/mac/ue.cc
+++ b/srsenb/src/mac/ue.cc
@@ -256,7 +256,7 @@ void ue::push_pdu(uint32_t tti, uint32_t len)
 bool ue::process_ce(srslte::sch_subh *subh) {
   uint32_t buff_size[4] = {0, 0, 0, 0};
   float phr = 0;
-  uint32_t idx = 0;
+  int32_t idx = 0;
   uint16_t old_rnti = 0;
   bool is_bsr = false;
   switch(subh->ce_type()) {
@@ -279,6 +279,10 @@ bool ue::process_ce(srslte::sch_subh *subh) {
     case srslte::sch_subh::TRUNC_BSR: 
     case srslte::sch_subh::SHORT_BSR:
       idx = subh->get_bsr(buff_size);
+      if(idx == -1){
+        Error("Invalid Index Passed to lc groups\n");
+        break;
+      }
       for (uint32_t i=0;i<lc_groups[idx].size();i++) {
         // Indicate BSR to scheduler
         sched->ul_bsr(rnti, lc_groups[idx][i], buff_size[idx]);
diff --git a/srsenb/test/upper/ip_test.cc b/srsenb/test/upper/ip_test.cc
index 0e84f6471..1d8423b9d 100644
--- a/srsenb/test/upper/ip_test.cc
+++ b/srsenb/test/upper/ip_test.cc
@@ -653,7 +653,7 @@ int setup_if_addr(char *ip_addr)
     close(tun_fd);
     return -1;
   }
-
+  
   close(sock);
 
   return(tun_fd);