diff --git a/matlab/tests/pdcch_bler.m b/matlab/tests/pdcch_bler.m
index 1843d9e8c..d63883b7d 100644
--- a/matlab/tests/pdcch_bler.m
+++ b/matlab/tests/pdcch_bler.m
@@ -11,7 +11,7 @@ SNR_values = linspace(2,6,6);
 txCFI = 3;
 enbConfig.NDLRB = 15;                % No of Downlink RBs in total BW
 enbConfig.CyclicPrefix = 'Normal';  % CP length
-enbConfig.CFI = txCFI;                                                                                                                                                                                                                                                                                                                                                                                                                           ;                  % 4 PDCCH symbols as NDLRB <= 10
+enbConfig.CFI = txCFI;                                                                                                                                                                                                                                                                                                                                                                                                                                             % 4 PDCCH symbols as NDLRB <= 10
 enbConfig.Ng = 'One';             % HICH groups
 enbConfig.CellRefP = 1;             % 1-antenna ports
 enbConfig.NCellID = 0;             % Physical layer cell identity
@@ -23,7 +23,7 @@ C_RNTI = 1;                         % 16-bit UE-specific mask
 %% Setup Fading channel model 
 cfg.Seed = 8;                  % Random channel seed
 cfg.NRxAnts = 1;               % 1 receive antenna
-cfg.DelayProfile = 'EVA';      % EVA delay spread
+cfg.DelayProfile = 'EPA';      % EVA delay spread
 cfg.DopplerFreq = 5;           % 120Hz Doppler frequency
 cfg.MIMOCorrelation = 'Low';   % Low (no) MIMO correlation
 cfg.InitTime = 0;              % Initialize at time zero
@@ -56,7 +56,7 @@ dciConfig.Allocation.RIV = 26;      % Resource indication value
 if C_RNTI<65535
     pdcchConfig.RNTI = C_RNTI;            % Radio network temporary identifier
 end
-pdcchConfig.PDCCHFormat = 0;          % PDCCH format
+pdcchConfig.PDCCHFormat = 3;          % PDCCH format
 ueConfig.RNTI = C_RNTI;
 
 candidates = ltePDCCHSpace(enbConfig, pdcchConfig, {'bits', '1based'});
@@ -153,7 +153,7 @@ for snr_idx=1:length(SNR_values)
         %% Same with srsLTE
         [rxCFI_srslte, pcfichRx2, pcfichSymbols2] = srslte_pcfich(enbConfigRx, subframe_rx);
         decoded_cfi_srslte(snr_idx) = decoded_cfi_srslte(snr_idx) + (rxCFI_srslte == txCFI); 
-        enbConfigRx.CFI = rxCFI;
+        enbConfigRx.CFI = txCFI;
         [found_srslte, pdcchBits2, pdcchRx2, pdcchSymbols2, hest2] = srslte_pdcch(enbConfigRx, ueConfig.RNTI, subframe_rx, hest, nest);
         decoded_srslte(snr_idx) = decoded_srslte(snr_idx)+found_srslte;
     end
diff --git a/srslte/examples/pdsch_ue.c b/srslte/examples/pdsch_ue.c
index 8665fd54e..d9e209aee 100644
--- a/srslte/examples/pdsch_ue.c
+++ b/srslte/examples/pdsch_ue.c
@@ -546,7 +546,7 @@ int main(int argc, char **argv) {
               #endif
 
             } 
-                        
+                                    
             nof_trials++; 
             
             rsrq = SRSLTE_VEC_EMA(srslte_chest_dl_get_rsrq(&ue_dl.chest), rsrq, 0.1);
@@ -585,7 +585,7 @@ int main(int argc, char **argv) {
         sfn++; 
         if (sfn == 1024) {
           sfn = 0; 
-          printf("reset\n");
+          printf("\n");
           ue_dl.pkt_errors = 0; 
           ue_dl.pkts_total = 0; 
           ue_dl.nof_detected = 0;           
diff --git a/srslte/lib/fec/viterbi.c b/srslte/lib/fec/viterbi.c
index 218e70639..a301964cb 100644
--- a/srslte/lib/fec/viterbi.c
+++ b/srslte/lib/fec/viterbi.c
@@ -40,7 +40,7 @@
 
 #define TB_ITER 3
 
-#define DEFAULT_GAIN 16
+#define DEFAULT_GAIN 20
 
 //#undef LV_HAVE_SSE
 
diff --git a/srslte/lib/phch/pcfich.c b/srslte/lib/phch/pcfich.c
index c102e2b28..e1fc400a3 100644
--- a/srslte/lib/phch/pcfich.c
+++ b/srslte/lib/phch/pcfich.c
@@ -117,14 +117,16 @@ float srslte_pcfich_cfi_decode(srslte_pcfich_t *q, uint32_t *cfi) {
   int i;
   int index = 0;
   float max_corr = 0;
+  float corr[3];
   
   for (i = 0; i < 3; i++) {
-    float corr = fabsf(srslte_vec_dot_prod_fff(q->cfi_table_float[i], q->data_f, PCFICH_CFI_LEN));
-    if (corr > max_corr) {
-      max_corr = corr; 
+    corr[i] = srslte_vec_dot_prod_fff(q->cfi_table_float[i], q->data_f, PCFICH_CFI_LEN);
+    if (corr[i] > max_corr) {
+      max_corr = corr[i]; 
       index = i; 
     }
   }
+  
   if (cfi) {
     *cfi = index + 1;
   }