diff --git a/openair1/PHY/INIT/nr_init.c b/openair1/PHY/INIT/nr_init.c
index bf8088143c..e7f0771556 100644
--- a/openair1/PHY/INIT/nr_init.c
+++ b/openair1/PHY/INIT/nr_init.c
@@ -88,11 +88,10 @@ int init_codebook_gNB(PHY_VARS_gNB *gNB) {
     //Get the uniform planar array parameters
     // To be confirmed
     int O2 = N2 > 1? 4 : 1; //Vertical beam oversampling (1 or 4)
-    int O1 = CSI_RS_antenna_ports > 2? 4 : 1; //Horizontal beam oversampling (1 or 4)
+    int O1 = CSI_RS_antenna_ports > 2 ? 4 : 1; //Horizontal beam oversampling (1 or 4)
     AssertFatal(CSI_RS_antenna_ports == N1*N2*x_polarization,
                 "Nb of antenna ports at PHY %d does not correspond to what passed down with fapi %d\n",
                  N1*N2*x_polarization, CSI_RS_antenna_ports);
-    LOG_D(PHY, "NR Codebook Config: antenna ports: %d N1 %d N2 %d\n",CSI_RS_antenna_ports,N1,N2);
 
     // Generation of codebook Type1 with codebookMode 1 (CSI_RS_antenna_ports < 16)
     if (CSI_RS_antenna_ports < 16) {
diff --git a/openair1/SIMULATION/NR_PHY/dlsim.c b/openair1/SIMULATION/NR_PHY/dlsim.c
index 7753d807d1..5a5667506f 100644
--- a/openair1/SIMULATION/NR_PHY/dlsim.c
+++ b/openair1/SIMULATION/NR_PHY/dlsim.c
@@ -781,6 +781,9 @@ int main(int argc, char **argv)
   pdsch_AntennaPorts.N1 = n_tx;
   pdsch_AntennaPorts.N2 = 1;
   pdsch_AntennaPorts.XP = 1;
+  gNB->ap_N1 = pdsch_AntennaPorts.N1;
+  gNB->ap_N2 = pdsch_AntennaPorts.N2;
+  gNB->ap_XP = pdsch_AntennaPorts.XP;
 
   fill_default_secondaryCellGroup(scc, scd, secondaryCellGroup, 0, 1, pdsch_AntennaPorts, 6, 0, 0, 0, 0);