diff --git a/srslte/include/srslte/enb/enb_dl.h b/srslte/include/srslte/enb/enb_dl.h
index 7f3b034e0..a95c6f824 100644
--- a/srslte/include/srslte/enb/enb_dl.h
+++ b/srslte/include/srslte/enb/enb_dl.h
@@ -92,7 +92,7 @@ typedef struct SRSLTE_API {
 } srslte_enb_dl_t;
 
 typedef struct {
-  uint32_t                rnti_idx; 
+  int                     rnti_idx; 
   srslte_ra_dl_dci_t      grant;
   srslte_dci_location_t   location; 
   srslte_softbuffer_tx_t *softbuffer;
@@ -101,7 +101,7 @@ typedef struct {
 
 typedef struct {
   uint8_t  ack;
-  uint32_t rnti_idx; 
+  int      rnti_idx; 
 } srslte_enb_dl_phich_t; 
 
 /* This function shall be called just after the initial synchronization */
diff --git a/srslte/include/srslte/enb/enb_ul.h b/srslte/include/srslte/enb/enb_ul.h
index bd1f0c908..c636c994b 100644
--- a/srslte/include/srslte/enb/enb_ul.h
+++ b/srslte/include/srslte/enb/enb_ul.h
@@ -77,7 +77,7 @@ typedef struct SRSLTE_API {
 } srslte_enb_ul_t;
 
 typedef struct {
-  uint32_t                rnti_idx; 
+  int                     rnti_idx; 
   srslte_ra_ul_dci_t      grant;
   srslte_dci_location_t   location; 
   uint32_t                rv_idx; 
diff --git a/srslte/lib/phch/pdsch.c b/srslte/lib/phch/pdsch.c
index 174b8715a..56089cefb 100644
--- a/srslte/lib/phch/pdsch.c
+++ b/srslte/lib/phch/pdsch.c
@@ -562,7 +562,6 @@ int srslte_pdsch_encode_seq(srslte_pdsch_t *q,
   int ret = SRSLTE_ERROR_INVALID_INPUTS; 
    
    if (q             != NULL &&
-       data          != NULL &&
        cfg  != NULL)
   {
 
diff --git a/srslte/lib/phch/prach.c b/srslte/lib/phch/prach.c
index 39114ec8e..4406297c2 100644
--- a/srslte/lib/phch/prach.c
+++ b/srslte/lib/phch/prach.c
@@ -600,10 +600,7 @@ int srslte_prach_detect_offset(srslte_prach_t *p,
         for (int j=0;j<n_wins;j++) {
           if(p->peak_values[j] > p->detect_factor*corr_ave)
           {
-            printf("ncs=%d, nzc=%d, nwins=%d, Nroot=%d, i=%d, j=%d, start=%d, peak_value=%f, peak_offset=%d, tseq=%f\n", 
-                   p->N_cs, p->N_zc, n_wins, p->N_roots, i, j, (p->N_zc-(j*p->N_cs))%p->N_zc, p->peak_values[j], 
-                   p->peak_offsets[j], p->T_seq*1e6);
-            memcpy(save_corr, p->corr, p->N_zc*sizeof(float));
+            //memcpy(save_corr, p->corr, p->N_zc*sizeof(float));
             if (indices) {
               indices[*n_indices]     = (i*n_wins)+j;
             }