diff --git a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
index c33e5fd34b..2c407fcb01 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_dci_tools.c
@@ -160,7 +160,7 @@ void nr_fill_dci(PHY_VARS_gNB *gNB,
   dlsch->harq_mask                |= (1<<pdu_rel15->harq_pid);
   dlsch->rnti                      = params_rel15->rnti;
 
-  dci_alloc->L = 8;
+  dci_alloc->L = 4;
   memcpy((void*)&dci_alloc->pdcch_params, (void*)params_rel15, sizeof(nfapi_nr_dl_config_pdcch_parameters_rel15_t));
   dci_alloc->size = nr_get_dci_size(dci_alloc->pdcch_params.dci_format,
 				    dci_alloc->pdcch_params.rnti_type,
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
index 81c05d7dcf..5d73930ecd 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_phytest.c
@@ -53,7 +53,7 @@ void nr_schedule_css_dlsch_phytest(module_id_t   module_idP,
   nfapi_tx_request_pdu_t            *TX_req;
 
   nfapi_nr_config_request_t *cfg = &nr_mac->config[0];
-  uint16_t rnti = 0x1234;
+  uint16_t rnti = 0x0;
 
   uint16_t sfn_sf = frameP << 7 | slotP;
   int dl_carrier_bandwidth = cfg->rf_config.dl_carrier_bandwidth.value;
@@ -184,7 +184,7 @@ int configure_fapi_dl_Tx(nfapi_nr_dl_config_request_body_t *dl_req,
 	nfapi_nr_dl_config_request_pdu_t  *dl_config_dci_pdu;
 	nfapi_nr_dl_config_request_pdu_t  *dl_config_dlsch_pdu;
 	int TBS;
-	uint16_t rnti = 0x1234;
+	uint16_t rnti = 0x0;
 	int dl_carrier_bandwidth = cfg->rf_config.dl_carrier_bandwidth.value;
 
 
@@ -312,7 +312,7 @@ void nr_schedule_uss_dlsch_phytest(module_id_t   module_idP,
   //NR_COMMON_channels_t                *cc           = nr_mac->common_channels;
   nfapi_nr_dl_config_request_body_t   *dl_req;
   nfapi_tx_request_pdu_t            *TX_req;
-  uint16_t rnti = 0x1234;
+  uint16_t rnti = 0x0;
 
   nfapi_nr_config_request_t *cfg = &nr_mac->config[0];
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/main.c b/openair2/LAYER2/NR_MAC_gNB/main.c
index 9b95cd1470..08dd1869af 100644
--- a/openair2/LAYER2/NR_MAC_gNB/main.c
+++ b/openair2/LAYER2/NR_MAC_gNB/main.c
@@ -52,7 +52,7 @@ void nr_init_coreset(nfapi_nr_coreset_t *coreset) {
 
   coreset->coreset_id = 1;
   coreset->frequency_domain_resources = 0x1E0000000000;//0x1FFFE0000000; // 96 RB starting from CRB0
-  coreset->duration = 2;
+  coreset->duration = 1;
   coreset->cce_reg_mapping_type = NFAPI_NR_CCE_REG_MAPPING_NON_INTERLEAVED;
   coreset->reg_bundle_size = 6;
   coreset->interleaver_size = 2;
@@ -66,14 +66,14 @@ void nr_init_search_space(nfapi_nr_search_space_t *search_space)
   search_space->search_space_id = 1;
   search_space->coreset_id = 1;
   search_space->search_space_type = NFAPI_NR_SEARCH_SPACE_TYPE_UE_SPECIFIC;
-  search_space->duration = 5;
+  search_space->duration = 1;
   search_space->slot_monitoring_periodicity = NFAPI_NR_SS_PERIODICITY_SL10;
   search_space->slot_monitoring_offset = 1;
   search_space->monitoring_symbols_in_slot = 0x3000; // 14 bits field
   search_space->css_formats_0_0_and_1_0 = 1;
   search_space->uss_dci_formats = 0; // enum to be defined-- formats 0.0 and 1.0
   for (int i=0; i<NFAPI_NR_MAX_NB_CCE_AGGREGATION_LEVELS; i++)
-    search_space->number_of_candidates[i] = 4; // TODO
+    search_space->number_of_candidates[i] = 1; // TODO
 }
 
 void mac_top_init_gNB(void)