diff --git a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
index 0f63ec6e26..6ea207850f 100644
--- a/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
+++ b/openair1/PHY/CODING/nrPolar_tools/nr_polar_encoder.c
@@ -133,6 +133,11 @@ void polar_encoder_dci(uint32_t *in,
 		polarParams->nr_polar_B[polarParams->payloadBits+8+i] =
 				( (((polarParams->crcBit)>>(23-i))&1) + ((n_RNTI>>(15-i))&1) ) % 2;
 	}
+#ifdef DEBUG_POLAR_ENCODER_DCI
+	printf("[polar_encoder_dci] B: ");
+	for (int i = 0; i < polarParams->K; i++) printf("%d-", polarParams->nr_polar_B[i]);
+	printf("\n");
+#endif
 
 	//Interleaving (c to c')
 	nr_polar_interleaver(polarParams->nr_polar_B,
diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
index 0747c0e4d2..f79d58c822 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
@@ -31,7 +31,7 @@
  */
 
 #include "nr_dci.h"
-#define DEBUG_NFAPI_NR_RNTI_RA
+//#define DEBUG_NFAPI_NR_RNTI_RA
 
 void nr_fill_cce_list(NR_gNB_DCI_ALLOC_t* dci_alloc, uint16_t n_shift, uint8_t m) {
 
@@ -129,36 +129,36 @@ void nr_fill_dci_and_dlsch(PHY_VARS_gNB *gNB,
     case NFAPI_NR_DL_DCI_FORMAT_1_0:
       switch(params_rel15->rnti_type) {
         case NFAPI_NR_RNTI_RA:
-#ifdef DEBUG_NFAPI_NR_RNTI_RA
-printf("frequency_domain_assignment = %05d = %#010x\n"
-		"     time_domain_assignment = %05d = %#010x\n"
-		"         vrb_to_prb_mapping = %05d = %#010x\n"
-		"                        MCS = %05d = %#010x\n"
-		"                 tb_scaling = %05d = %#010x\n",
-		pdu_rel15->frequency_domain_assignment,pdu_rel15->frequency_domain_assignment,
-		pdu_rel15->time_domain_assignment,pdu_rel15->time_domain_assignment,
-		pdu_rel15->vrb_to_prb_mapping,pdu_rel15->vrb_to_prb_mapping,
-		pdu_rel15->mcs,pdu_rel15->mcs,pdu_rel15->tb_scaling,pdu_rel15->tb_scaling);
-#endif
-          // Freq domain assignment
-          fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
-          printf("N_RB=%d & fsize=%d\n\n",N_RB,fsize);
-          for (int i=0; i<fsize; i++)
-            *dci_pdu |= ((pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<pos++;
-          // Time domain assignment
-          for (int i=0; i<4; i++)
-            *dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<pos++;
-          // VRB to PRB mapping
-          *dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<pos++;
-          // MCS
-          for (int i=0; i<5; i++)
-            *dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<pos++;
-          // TB scaling
-          for (int i=0; i<2; i++)
-            *dci_pdu |= ((pdu_rel15->tb_scaling>>(1-i))&1)<<pos++;
-          
-          break;
-
+        	// Freq domain assignment
+        	fsize = (int)ceil( log2( (N_RB*(N_RB+1))>>1 ) );
+        	#ifdef DEBUG_NFAPI_NR_RNTI_RA
+        	printf("frequency_domain_assignment = %05d = %#010x\n"
+        			"     time_domain_assignment = %05d = %#010x\n"
+        			"         vrb_to_prb_mapping = %05d = %#010x\n"
+        			"                        MCS = %05d = %#010x\n"
+        			"                 tb_scaling = %05d = %#010x\n"
+        			"                       N_RB = %05d = %#010x\n"
+        			"                      fsize = %05d = %#010x\n",
+					pdu_rel15->frequency_domain_assignment,pdu_rel15->frequency_domain_assignment,
+					pdu_rel15->time_domain_assignment,pdu_rel15->time_domain_assignment,
+					pdu_rel15->vrb_to_prb_mapping,pdu_rel15->vrb_to_prb_mapping,
+					pdu_rel15->mcs,pdu_rel15->mcs,pdu_rel15->tb_scaling,pdu_rel15->tb_scaling,
+					N_RB,N_RB,fsize,fsize);
+        	#endif
+        	for (int i=0; i<fsize; i++)
+        		*dci_pdu |= ((pdu_rel15->frequency_domain_assignment>>(fsize-i-1))&1)<<pos++;
+        	// Time domain assignment
+        	for (int i=0; i<4; i++)
+        		*dci_pdu |= ((pdu_rel15->time_domain_assignment>>(3-i))&1)<<pos++;
+        	// VRB to PRB mapping
+        	*dci_pdu |= (pdu_rel15->vrb_to_prb_mapping&1)<<pos++;
+        	// MCS
+        	for (int i=0; i<5; i++)
+        		*dci_pdu |= ((pdu_rel15->mcs>>(4-i))&1)<<pos++;
+        	// TB scaling
+        	for (int i=0; i<2; i++)
+        		*dci_pdu |= ((pdu_rel15->tb_scaling>>(1-i))&1)<<pos++;
+        	break;
       }
       break;
 
diff --git a/targets/RT/USER/nr-softmodem.c b/targets/RT/USER/nr-softmodem.c
index d2f43b2cb8..992ca65981 100644
--- a/targets/RT/USER/nr-softmodem.c
+++ b/targets/RT/USER/nr-softmodem.c
@@ -888,6 +888,7 @@ static  void wait_nfapi_init(char *thread_name) {
 
 int main( int argc, char **argv )
 {
+	crcTableInit();
   int i;
 #if defined (XFORMS)
   //void *status;