diff --git a/openair1/PHY/NR_TRANSPORT/nr_csi_rs.c b/openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
index f767bdd5c5..1888dcbeba 100644
--- a/openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
+++ b/openair1/PHY/NR_TRANSPORT/nr_csi_rs.c
@@ -44,7 +44,7 @@ void nr_generate_csi_rs(PHY_VARS_gNB *gNB,
   int wf, wt, lp, kp, symb;
   uint8_t fi = 0;
   double rho, alpha;
-  uint32_t beta;
+  uint32_t beta = amp;
 
   AssertFatal(b!=0, "Invalid CSI frequency domain mapping: no bit selected in bitmap\n");
 
diff --git a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
index 0cb5d71930..55c6afbb92 100644
--- a/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
+++ b/openair2/LAYER2/NR_MAC_gNB/gNB_scheduler_primitives.c
@@ -1937,6 +1937,8 @@ void nr_csirs_scheduling(int Mod_idP,
       csirs_pdu_rel15->power_control_offset = nzpcsi->powerControlOffset + 8;
       if (nzpcsi->powerControlOffsetSS)
         csirs_pdu_rel15->power_control_offset_ss = *nzpcsi->powerControlOffsetSS;
+      else
+        csirs_pdu_rel15->power_control_offset_ss = 1; // 0 dB
       switch(resourceMapping.frequencyDomainAllocation.present){
         case NR_CSI_RS_ResourceMapping__frequencyDomainAllocation_PR_row1:
           csirs_pdu_rel15->row = 1;
diff --git a/openair2/RRC/NR/rrc_gNB_reconfig.c b/openair2/RRC/NR/rrc_gNB_reconfig.c
index 310c7d3615..ac84afc510 100644
--- a/openair2/RRC/NR/rrc_gNB_reconfig.c
+++ b/openair2/RRC/NR/rrc_gNB_reconfig.c
@@ -1060,7 +1060,8 @@ void fill_default_secondaryCellGroup(NR_ServingCellConfigCommon_t *servingcellco
  resourceMapping.freqBand.nrofRBs = 104;
  nzpcsi0->resourceMapping = resourceMapping;
  nzpcsi0->powerControlOffset = 0;
- nzpcsi0->powerControlOffsetSS = NULL;
+ nzpcsi0->powerControlOffsetSS=calloc(1,sizeof(*nzpcsi0->powerControlOffsetSS));
+ *nzpcsi0->powerControlOffsetSS = NR_NZP_CSI_RS_Resource__powerControlOffsetSS_db0;
  nzpcsi0->scramblingID = 50;
  nzpcsi0->periodicityAndOffset = calloc(1,sizeof(*nzpcsi0->periodicityAndOffset));
  nzpcsi0->periodicityAndOffset->present = NR_CSI_ResourcePeriodicityAndOffset_PR_slots320;