diff --git a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
index 50928a7140..b5eb5de358 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dlsch.c
@@ -193,7 +193,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
   NR_DL_gNB_HARQ_t *harq = dlsch.harq_processes[dci_alloc.harq_pid];
   nfapi_nr_dl_config_dlsch_pdu_rel15_t *rel15 = &harq->dlsch_pdu.dlsch_pdu_rel15;
   nfapi_nr_dl_config_pdcch_parameters_rel15_t pdcch_params = dci_alloc.pdcch_params;
-  uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH];
+  uint32_t scrambled_output[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>5];
   int16_t mod_symbs[NR_MAX_NB_CODEWORDS][NR_MAX_PDSCH_ENCODED_LENGTH>>1];
   int16_t tx_layers[NR_MAX_NB_LAYERS][NR_MAX_PDSCH_ENCODED_LENGTH>>1];
   uint16_t n_symbs;
@@ -232,7 +232,7 @@ uint8_t nr_generate_pdsch(NR_gNB_DLSCH_t dlsch,
                          TBS,
                          mod_symbs[q]);
 #ifdef DEBUG_DLSCH
-printf("PDSCH Modulation: Qm %d()\n", Qm, n_symbs);
+printf("PDSCH Modulation: Qm %d(%d)\n", Qm, n_symbs);
 for (int i=0; i<n_symbs; i++) {
   for (int j=0; j<Qm; j++) {
     printf("%d %d\t", mod_symbs[0][(i*Qm+j)<<1], mod_symbs[0][((i*Qm+j)<<1)+1]);
@@ -243,10 +243,10 @@ for (int i=0; i<n_symbs; i++) {
 
 
   /// Layer mapping
-  nr_pdsch_layer_mapping(mod_symbs,
+  nr_pdsch_layer_mapping((int16_t**)mod_symbs,
                          rel15->nb_layers,
                          n_symbs,
-                         tx_layers);
+                         (int16_t**)tx_layers);
 
   /// Antenna port mapping
     //to be moved to init phase potentially, for now tx_layers 1-8 are mapped on antenna ports 1000-1007
diff --git a/openair1/PHY/NR_TRANSPORT/nr_pss.c b/openair1/PHY/NR_TRANSPORT/nr_pss.c
index 1f653038a6..84d4e0909d 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_pss.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_pss.c
@@ -22,7 +22,7 @@
 
 #include "PHY/NR_TRANSPORT/nr_transport.h"
 
-#define NR_PSS_DEBUG
+//#define NR_PSS_DEBUG
 
 int nr_generate_pss(  int16_t *d_pss,
                       int32_t **txdataF,
diff --git a/openair1/PHY/TOOLS/tools_defs.h b/openair1/PHY/TOOLS/tools_defs.h
index fd68a53c1d..51295857d3 100644
--- a/openair1/PHY/TOOLS/tools_defs.h
+++ b/openair1/PHY/TOOLS/tools_defs.h
@@ -32,6 +32,8 @@
 #include <stdint.h>
 #include "PHY/sse_intrin.h"
 
+#define CEILIDIV(a,b) ((a+b-1)/b)
+#define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
 
 struct complex {
   double x;
@@ -405,4 +407,6 @@ void idft8192(int16_t *x,int16_t *y,int scale);
 
 double interp(double x, double *xs, double *ys, int count);
 
+int write_output(const char *fname,const char *vname,void *data,int length,int dec,char format);
+
 #endif //__PHY_TOOLS_DEFS__H__
diff --git a/openair1/PHY/defs_common.h b/openair1/PHY/defs_common.h
index 743b40f9d8..f033f99e1e 100644
--- a/openair1/PHY/defs_common.h
+++ b/openair1/PHY/defs_common.h
@@ -65,6 +65,8 @@
 
 #include <pthread.h>
 
+#include "TOOLS/tools_defs.h"
+
 #include "targets/COMMON/openairinterface5g_limits.h"
 
 #include "types.h"
@@ -101,9 +103,6 @@
 #include "enums.h"
 #else
 
-#define CEILIDIV(a,b) ((a+b-1)/b)
-#define ROUNDIDIV(a,b) (((a<<1)+b)/(b<<1))
-
 typedef enum {TDD=1,FDD=0} lte_frame_type_t;
 
 typedef enum {EXTENDED=1,NORMAL=0} lte_prefix_type_t;