diff --git a/lib/include/srslte/phy/common/phy_common_nr.h b/lib/include/srslte/phy/common/phy_common_nr.h
index b148c1da6..d04137953 100644
--- a/lib/include/srslte/phy/common/phy_common_nr.h
+++ b/lib/include/srslte/phy/common/phy_common_nr.h
@@ -91,7 +91,7 @@ extern "C" {
 
 /**
  * @brief defines the maximum number of resource elements per PRB
- * @remark Defined in TS 36.214 V15.10.0 5.1.3.2 Transport block size determination, point 1, second bullet
+ * @remark Defined in TS 38.214 V15.10.0 5.1.3.2 Transport block size determination, point 1, second bullet
  */
 #define SRSLTE_MAX_NRE_NR 156
 
diff --git a/lib/src/phy/ch_estimation/dmrs_pdsch.c b/lib/src/phy/ch_estimation/dmrs_pdsch.c
index 00c9de8eb..4edf96d91 100644
--- a/lib/src/phy/ch_estimation/dmrs_pdsch.c
+++ b/lib/src/phy/ch_estimation/dmrs_pdsch.c
@@ -726,7 +726,7 @@ int srslte_dmrs_pdsch_estimate(srslte_dmrs_pdsch_t*           q,
   uint32_t symbol_idx = 0;
   uint32_t count      = 0;
   for (uint32_t l = grant->S; l < grant->S + grant->L; l++) {
-    while (symbols[symbol_idx] < l && symbol_idx < nof_symbols) {
+    while (symbols[symbol_idx] < l && symbol_idx < nof_symbols - 1) {
       symbol_idx++;
     }
 
diff --git a/lib/src/phy/phch/pdsch_nr.c b/lib/src/phy/phch/pdsch_nr.c
index 058a93dd2..d7f00c00f 100644
--- a/lib/src/phy/phch/pdsch_nr.c
+++ b/lib/src/phy/phch/pdsch_nr.c
@@ -39,7 +39,6 @@ int pdsch_nr_init_common(srslte_pdsch_nr_t* q, const srslte_pdsch_args_t* args)
 
 int srslte_pdsch_nr_init_enb(srslte_pdsch_nr_t* q, const srslte_pdsch_args_t* args)
 {
-
   if (q == NULL) {
     return SRSLTE_ERROR_INVALID_INPUTS;
   }
@@ -58,7 +57,6 @@ int srslte_pdsch_nr_init_enb(srslte_pdsch_nr_t* q, const srslte_pdsch_args_t* ar
 
 int srslte_pdsch_nr_init_ue(srslte_pdsch_nr_t* q, const srslte_pdsch_args_t* args)
 {
-
   if (q == NULL || args == NULL) {
     return SRSLTE_ERROR_INVALID_INPUTS;
   }