diff --git a/lib/src/phy/phch/pucch.c b/lib/src/phy/phch/pucch.c
index dd3977757..834963df7 100644
--- a/lib/src/phy/phch/pucch.c
+++ b/lib/src/phy/phch/pucch.c
@@ -632,10 +632,7 @@ static int uci_mod_bits(srslte_pucch_t *q, srslte_pucch_format_t format, uint8_t
 void srslte_refsignal_r_uv_arg_1prb(float *arg, uint32_t u);
 
 
-float tmp_alpha;
-uint32_t tmp_noc, tmp_nprime, tmp_woc;
-
-static int pucch_encode_(srslte_pucch_t* q, srslte_pucch_format_t format, 
+static int pucch_encode_(srslte_pucch_t* q, srslte_pucch_format_t format,
                           uint32_t n_pucch, uint32_t sf_idx, uint16_t rnti,
                           uint8_t bits[SRSLTE_PUCCH_MAX_BITS], cf_t z[SRSLTE_PUCCH_MAX_SYMBOLS], bool signal_only) 
 {
@@ -681,11 +678,6 @@ static int pucch_encode_(srslte_pucch_t* q, srslte_pucch_format_t format,
         DEBUG("PUCCH d_0: %.1f+%.1fi, alpha: %.1f, n_oc: %d, n_prime_ns: %d, n_rb_2=%d\n",
               __real__ q->d[0], __imag__ q->d[0], alpha, n_oc, n_prime_ns, q->pucch_cfg.n_rb_2);
 
-        tmp_alpha = alpha;
-        tmp_noc   = n_oc;
-        tmp_nprime = n_prime_ns;
-        tmp_woc   = w_n_oc[N_sf_widx][n_oc%3][m];
-
         for (uint32_t n=0;n<SRSLTE_PUCCH_N_SEQ;n++) {
           z[(ns%2)*N_sf_0*SRSLTE_PUCCH_N_SEQ+m*SRSLTE_PUCCH_N_SEQ+n] = 
             q->d[0]*cexpf(I*(w_n_oc[N_sf_widx][n_oc%3][m]+q->tmp_arg[n]+alpha*n+S_ns));
diff --git a/lib/src/phy/ue/ue_ul.c b/lib/src/phy/ue/ue_ul.c
index b3842d0b7..e7c616643 100644
--- a/lib/src/phy/ue/ue_ul.c
+++ b/lib/src/phy/ue/ue_ul.c
@@ -309,9 +309,7 @@ int srslte_ue_ul_pucch_encode(srslte_ue_ul_t *q, srslte_uci_data_t uci_data,
     
     uint32_t sf_idx = tti%10; 
     ret = SRSLTE_ERROR; 
-    bzero(q->sf_symbols, sizeof(cf_t)*SRSLTE_SF_LEN_RE(q->cell.nof_prb, q->cell.cp));
-    
-    
+
     uint8_t pucch_bits[SRSLTE_PUCCH_MAX_BITS];
     uint8_t pucch2_bits[2];
     bzero(pucch_bits, SRSLTE_PUCCH_MAX_BITS*sizeof(uint8_t));
diff --git a/srsue/src/main.cc b/srsue/src/main.cc
index a4651a029..759d1b739 100644
--- a/srsue/src/main.cc
+++ b/srsue/src/main.cc
@@ -525,7 +525,9 @@ int main(int argc, char *argv[])
   }
   if (running) {
     if (args.expert.pregenerate_signals) {
+      printf("Pre-generating signals...\n");
       ue->pregenerate_signals(true);
+      printf("Done pregenerating signals.\n");
     }
     if (args.gui.enable) {
       ue->start_plot();
diff --git a/srsue/src/phy/phch_worker.cc b/srsue/src/phy/phch_worker.cc
index edc956bf5..d92ad4fcf 100644
--- a/srsue/src/phy/phch_worker.cc
+++ b/srsue/src/phy/phch_worker.cc
@@ -1327,7 +1327,7 @@ void phch_worker::encode_pucch()
   memcpy(&t[2], &logtime_start[2], sizeof(struct timeval));
   get_time_interval(logtime_start);
   get_time_interval(t);
-  snprintf(timestr, 64, ", tot_time=%d us", (int) logtime_start[0].tv_usec);
+  snprintf(timestr, 64, ", pucch_time=%d us, tot_time=%d us", (int) t[0].tv_usec, (int) logtime_start[0].tv_usec);
 #endif
 
   float tx_power = srslte_ue_ul_pucch_power(&ue_ul, phy->pathloss, ue_ul.last_pucch_format, uci_data.uci_cqi_len, uci_data.uci_ack_len);