diff --git a/srslte/lib/fec/src/rm_turbo.c b/srslte/lib/fec/src/rm_turbo.c
index 3bbf18828..5f7f4c5c7 100644
--- a/srslte/lib/fec/src/rm_turbo.c
+++ b/srslte/lib/fec/src/rm_turbo.c
@@ -147,7 +147,7 @@ int srslte_rm_turbo_rx(float *w_buff, uint32_t w_buff_len, float *input, uint32_
   K_p = nrows * NCOLS;
   if (3 * K_p > w_buff_len) {
     fprintf(stderr,
-        "Input too large. Max output length including dummy bits is %d (3x%dx32, in_len %d)\n",
+        "Output too large. Max output length including dummy bits is %d (3x%dx32, in_len %d)\n",
         w_buff_len, nrows, out_len);
     return -1;
   }
diff --git a/srslte/lib/fec/src/softbuffer.c b/srslte/lib/fec/src/softbuffer.c
index 5efa83057..2373873a3 100644
--- a/srslte/lib/fec/src/softbuffer.c
+++ b/srslte/lib/fec/src/softbuffer.c
@@ -63,7 +63,7 @@ int srslte_softbuffer_rx_init(srslte_softbuffer_rx_t *q, srslte_cell_t cell) {
       }
       
       // FIXME: Use HARQ buffer limitation based on UE category
-      q->buff_size = cell.nof_prb * MAX_PDSCH_RE(cell.cp) * srslte_mod_bits_x_symbol(SRSLTE_MOD_64QAM);
+      q->buff_size = 3 * SRSLTE_TCOD_MAX_LEN_CB;
       for (uint32_t i=0;i<q->max_cb;i++) {
         q->buffer_f[i] = srslte_vec_malloc(sizeof(float) * q->buff_size);
         if (!q->buffer_f[i]) {
@@ -125,7 +125,7 @@ int srslte_softbuffer_tx_init(srslte_softbuffer_tx_t *q, srslte_cell_t cell) {
       }
      
       // FIXME: Use HARQ buffer limitation based on UE category
-      q->buff_size = cell.nof_prb * MAX_PDSCH_RE(cell.cp) * 6 * 10;
+      q->buff_size = 3 * SRSLTE_TCOD_MAX_LEN_CB;
       for (uint32_t i=0;i<q->max_cb;i++) {
         q->buffer_b[i] = srslte_vec_malloc(sizeof(float) * q->buff_size);
         if (!q->buffer_b[i]) {
diff --git a/srslte/lib/phch/src/pdsch.c b/srslte/lib/phch/src/pdsch.c
index 69b001d13..893e7a1d8 100644
--- a/srslte/lib/phch/src/pdsch.c
+++ b/srslte/lib/phch/src/pdsch.c
@@ -310,7 +310,7 @@ int srslte_pdsch_cfg(srslte_pdsch_cfg_t *cfg, srslte_cell_t cell, srslte_dci_msg
   if (dci_msg) {
     srslte_ra_dl_dci_t dl_dci; 
     if (srslte_dci_msg_to_dl_grant(dci_msg, rnti, cell.nof_prb, &dl_dci, &cfg->grant)) {
-      //fprintf(stderr, "Error unpacking PDSCH scheduling DCI message\n");
+      fprintf(stderr, "Error unpacking PDSCH scheduling DCI message\n");
       return SRSLTE_ERROR;
     }    
     if (rnti == SRSLTE_SIRNTI) {