diff --git a/executables/nr-uesoftmodem.c b/executables/nr-uesoftmodem.c
index 8efc9331b7..19e1bcf7b5 100644
--- a/executables/nr-uesoftmodem.c
+++ b/executables/nr-uesoftmodem.c
@@ -320,7 +320,6 @@ void set_options(int CC_id, PHY_VARS_NR_UE *UE){
   UE->rf_map.card          = card_offset;
   UE->rf_map.chain         = CC_id + chain_offset;
 
-
   LOG_I(PHY,"Set UE mode %d, UE_fo_compensation %d, UE_scan_carrier %d, UE_no_timing_correction %d \n", 
   	   UE->mode, UE->UE_fo_compensation, UE->UE_scan_carrier, UE->no_timing_correction);
 
diff --git a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
index 61042ce5fc..6e5e624e36 100644
--- a/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
+++ b/openair1/SCHED_NR_UE/pucch_uci_ue_nr.c
@@ -837,9 +837,9 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
   /* Generate PUCCH signal according to its format and parameters */
   ue->generate_ul_signal[gNB_id] = 1;
 
-  int16_t pucch_tx_power = get_pucch_tx_power_ue( ue, gNB_id, proc, format,
-                                                  nb_of_prbs, N_sc_ctrl_RB, nb_symbols, N_UCI, O_SR, O_CSI, O_ACK,
-                                                  O_CRC, n_HARQ_ACK);
+  int16_t pucch_tx_power = get_pucch_tx_power_ue(ue, gNB_id, proc, format,
+                                                 nb_of_prbs, N_sc_ctrl_RB, nb_symbols, N_UCI, O_SR, O_CSI, O_ACK,
+                                                 O_CRC, n_HARQ_ACK);
 
   /* set tx power */
   ue->tx_power_dBm[nr_slot_tx] = pucch_tx_power;
@@ -847,15 +847,12 @@ bool pucch_procedures_ue_nr(PHY_VARS_NR_UE *ue, uint8_t gNB_id, UE_nr_rxtx_proc_
 
   int tx_amp;
 
-#if defined(EXMIMO) || defined(OAI_USRP) || defined(OAI_BLADERF) || defined(OAI_LMSSDR) || defined(OAI_ADRV9371_ZC706)
-
   tx_amp = nr_get_tx_amp(pucch_tx_power,
-                      ue->tx_power_max_dBm,
-                      ue->frame_parms.N_RB_UL,
-                      nb_of_prbs);
-#else
-  tx_amp = AMP;
-#endif
+                         ue->tx_power_max_dBm,
+                         ue->frame_parms.N_RB_UL,
+                         nb_of_prbs);
+  if (tx_amp == 0)
+    tx_amp = AMP;
 
   switch(format) {
     case pucch_format0_nr: