diff --git a/srsenb/hdr/mac/mac.h b/srsenb/hdr/mac/mac.h
index 4620c9629..d71245e89 100644
--- a/srsenb/hdr/mac/mac.h
+++ b/srsenb/hdr/mac/mac.h
@@ -113,10 +113,7 @@ public:
 
 private:  
 
-  void log_step_ul(uint32_t tti);
-  void log_step_dl(uint32_t tti);
-  
-  static const int MAX_LOCATIONS = 20; 
+  static const int MAX_LOCATIONS = 20;
   static const uint32_t cfi = 3; 
   srslte_dci_location_t locations[MAX_LOCATIONS];
   
diff --git a/srsenb/hdr/mac/scheduler.h b/srsenb/hdr/mac/scheduler.h
index c70ee4247..231239285 100644
--- a/srsenb/hdr/mac/scheduler.h
+++ b/srsenb/hdr/mac/scheduler.h
@@ -68,7 +68,7 @@ public:
     /* Virtual methods for user metric calculation */
     virtual void           new_tti(std::map<uint16_t,sched_ue> &ue_db, uint32_t nof_rb, uint32_t tti) = 0;
     virtual ul_harq_proc*  get_user_allocation(sched_ue *user) = 0; 
-    virtual void           update_allocation(ul_harq_proc::ul_alloc_t alloc) = 0; 
+    virtual void           update_allocation(ul_harq_proc::ul_alloc_t alloc) = 0;
   };
 
   
diff --git a/srsenb/hdr/mac/scheduler_metric.h b/srsenb/hdr/mac/scheduler_metric.h
index b9d515ade..eda0b31ed 100644
--- a/srsenb/hdr/mac/scheduler_metric.h
+++ b/srsenb/hdr/mac/scheduler_metric.h
@@ -65,7 +65,7 @@ class ul_metric_rr : public sched::metric_ul
 public:
   void           new_tti(std::map<uint16_t,sched_ue> &ue_db, uint32_t nof_rb, uint32_t tti);
   ul_harq_proc*  get_user_allocation(sched_ue *user); 
-  void           update_allocation(ul_harq_proc::ul_alloc_t alloc); 
+  void           update_allocation(ul_harq_proc::ul_alloc_t alloc);
 private:
   
   const static int MAX_PRB = 100; 
diff --git a/srsenb/hdr/mac/scheduler_ue.h b/srsenb/hdr/mac/scheduler_ue.h
index b59461140..3653ff65c 100644
--- a/srsenb/hdr/mac/scheduler_ue.h
+++ b/srsenb/hdr/mac/scheduler_ue.h
@@ -42,7 +42,6 @@ public:
   // used by sched_metric
   uint32_t ue_idx;
 
-  bool has_pusch;
   bool has_pucch;
   
   typedef struct {
@@ -116,7 +115,7 @@ public:
   bool       needs_cqi(uint32_t tti, bool will_send = false); 
   uint32_t   get_max_retx(); 
   
-  bool       get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2], uint32_t *L);
+  bool       get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2]);
   bool       pucch_sr_collision(uint32_t current_tti, uint32_t n_cce);
 
   uint32_t   get_pending_ul_old_data();
diff --git a/srsenb/src/mac/mac.cc b/srsenb/src/mac/mac.cc
index 7cb30cc65..6c8458540 100644
--- a/srsenb/src/mac/mac.cc
+++ b/srsenb/src/mac/mac.cc
@@ -403,7 +403,7 @@ int mac::rach_detected(uint32_t tti, uint32_t preamble_idx, uint32_t time_adv)
 
 int mac::get_dl_sched(uint32_t tti, dl_sched_t *dl_sched_res)
 {
-  log_step_dl(tti);
+  log_h->step(tti);
 
   if (!started) {
     return 0; 
@@ -544,8 +544,8 @@ uint8_t* mac::assemble_si(uint32_t index)
 
 int mac::get_ul_sched(uint32_t tti, ul_sched_t *ul_sched_res) 
 {
-  
-  log_step_ul(tti);
+
+  log_h->step(tti);
   
   if (!started) {
     return 0; 
@@ -602,24 +602,6 @@ int mac::get_ul_sched(uint32_t tti, ul_sched_t *ul_sched_res)
   return SRSLTE_SUCCESS; 
 }
 
-void mac::log_step_ul(uint32_t tti) 
-{
-  int tti_ul = tti-8;
-  if (tti_ul < 0) {
-    tti_ul += 10240;
-  }
-  log_h->step(tti_ul);
-}
-
-void mac::log_step_dl(uint32_t tti) 
-{
-  int tti_dl = tti-4;
-  if (tti_dl < 0) {
-    tti_dl += 10240;
-  }
-  log_h->step(tti_dl);
-}
-
 void mac::tti_clock()
 {
   timers_thread.tti_clock();
diff --git a/srsenb/src/mac/scheduler.cc b/srsenb/src/mac/scheduler.cc
index 79cf3f476..539b7725f 100644
--- a/srsenb/src/mac/scheduler.cc
+++ b/srsenb/src/mac/scheduler.cc
@@ -700,7 +700,6 @@ int sched::ul_sched(uint32_t tti, srsenb::sched_interface::ul_sched_res_t* sched
     sched_ue *user = (sched_ue*) &iter->second;
     uint16_t rnti  = (uint16_t) iter->first; 
 
-    user->has_pusch = false;
     user->has_pucch = false;
 
     ul_harq_proc *h = user->get_ul_harq(current_tti);
@@ -726,15 +725,12 @@ int sched::ul_sched(uint32_t tti, srsenb::sched_interface::ul_sched_res_t* sched
     sched_ue *user = (sched_ue*) &iter->second;
     uint16_t rnti  = (uint16_t) iter->first; 
     uint32_t prb_idx[2] = {0, 0}; 
-    uint32_t L = 0; 
-    if (user->get_pucch_sched(current_tti, prb_idx, &L)) {
+    if (user->get_pucch_sched(current_tti, prb_idx)) {
       user->has_pucch = true;
-      // allocate PUCCH if no PUSCH for user
-      if (!user->has_pusch) {
-        for (int i=0;i<2;i++) {
-          ul_harq_proc::ul_alloc_t pucch = {prb_idx[i], L};
-          ul_metric->update_allocation(pucch);
-        }
+      // allocate PUCCH
+      for (int i=0;i<2;i++) {
+        ul_harq_proc::ul_alloc_t pucch = {prb_idx[i], 1};
+        ul_metric->update_allocation(pucch);
       }
     }
   }
@@ -807,22 +803,22 @@ int sched::ul_sched(uint32_t tti, srsenb::sched_interface::ul_sched_res_t* sched
             user->unset_sr();
           }
 
-          log_h->info("SCHED: %s %s rnti=0x%x, pid=%d, dci=%d,%d, grant=%d,%d, n_rtx=%d, tbs=%d, bsr=%d (%d-%d)\n",
+          log_h->info("SCHED: %s %s rnti=0x%x, pid=%d, dci=%d,%d, grant=(%d,%d), n_rtx=%d, tbs=%d, bsr=%d (%d-%d)\n",
                       is_rar?"RAR":"UL",
                       is_newtx?"tx":"retx",                
                       rnti, h->get_id(), 
                       sched_result->pusch[nof_dci_elems].dci_location.L, sched_result->pusch[nof_dci_elems].dci_location.ncce,
-                      alloc.RB_start, alloc.L, h->nof_retx(), sched_result->pusch[nof_dci_elems].tbs, 
+                      alloc.RB_start, alloc.RB_start+alloc.L, h->nof_retx(), sched_result->pusch[nof_dci_elems].tbs,
                       user->get_pending_ul_new_data(current_tti),pending_data_before, user->get_pending_ul_old_data());
 
           nof_dci_elems++;          
         } else {
-          log_h->warning("SCHED: Error %s %s rnti=0x%x, pid=%d, dci=%d,%d, grant=%d,%d, tbs=%d, bsr=%d\n", 
+          log_h->warning("SCHED: Error %s %s rnti=0x%x, pid=%d, dci=%d,%d, grant=(%d,%d), tbs=%d, bsr=%d\n",
                       is_rar?"RAR":"UL",
                       is_newtx?"tx":"retx",                
                       rnti, h->get_id(), 
                       sched_result->pusch[nof_dci_elems].dci_location.L, sched_result->pusch[nof_dci_elems].dci_location.ncce,
-                      alloc.RB_start, alloc.L, sched_result->pusch[nof_dci_elems].tbs, 
+                      alloc.RB_start, alloc.RB_start+alloc.L, sched_result->pusch[nof_dci_elems].tbs,
                       user->get_pending_ul_new_data(current_tti));
         }   
       }
diff --git a/srsenb/src/mac/scheduler_metric.cc b/srsenb/src/mac/scheduler_metric.cc
index 309eed45a..708ab2dd8 100644
--- a/srsenb/src/mac/scheduler_metric.cc
+++ b/srsenb/src/mac/scheduler_metric.cc
@@ -25,8 +25,7 @@
  */
 
 #include <string.h>
-
-#include "srslte/srslte.h"
+#include "mac/scheduler_harq.h"
 #include "mac/scheduler_metric.h"
 
 #define Error(fmt, ...)   log_h->error_line(__FILE__, __LINE__, fmt, ##__VA_ARGS__)
@@ -215,8 +214,7 @@ void ul_metric_rr::new_tti(std::map<uint16_t,sched_ue> &ue_db, uint32_t nof_rb_,
     sched_ue *user      = (sched_ue*) &iter->second;
     if (user->get_pending_ul_new_data(current_tti) || !user->get_ul_harq(current_tti)->is_empty()) {
       user->ue_idx    = nof_users_with_data;
-      user->has_pusch = true;
-      nof_users_with_data++; 
+      nof_users_with_data++;
     }
   }
 
@@ -275,7 +273,7 @@ void ul_metric_rr::update_allocation(ul_harq_proc::ul_alloc_t alloc)
     return; 
   }
   for (uint32_t n=alloc.RB_start;n<alloc.RB_start+alloc.L;n++) {
-    used_rb[n] = true; 
+    used_rb[n] = true;
   }
   available_rb -= alloc.L; 
 }
diff --git a/srsenb/src/mac/scheduler_ue.cc b/srsenb/src/mac/scheduler_ue.cc
index 1534d12ef..f0627bb4b 100644
--- a/srsenb/src/mac/scheduler_ue.cc
+++ b/srsenb/src/mac/scheduler_ue.cc
@@ -28,6 +28,7 @@
 #include <boost/concept_check.hpp>
 #include <srslte/interfaces/sched_interface.h>
 #include <srslte/phy/phch/pucch.h>
+#include <srslte/srslte.h>
 
 #include "srslte/srslte.h"
 #include "srslte/common/pdu.h"
@@ -232,7 +233,7 @@ bool sched_ue::pucch_sr_collision(uint32_t current_tti, uint32_t n_cce)
   }
 }
 
-bool sched_ue::get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2], uint32_t *L)
+bool sched_ue::get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2])
 {
   if (!phy_config_dedicated_enabled) {
     return false; 
@@ -241,7 +242,7 @@ bool sched_ue::get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2], uint32
   pucch_sched.sps_enabled = false;
   pucch_sched.n_pucch_sr = cfg.sr_N_pucch;
   pucch_sched.n_pucch_2  = cfg.n_pucch_cqi;
-  pucch_sched.N_pucch_1  = cfg.pucch_cfg.n1_pucch_an; 
+  pucch_sched.N_pucch_1  = cfg.pucch_cfg.n1_pucch_an;
   
   bool has_sr = cfg.sr_enabled && srslte_ue_ul_sr_send_tti(cfg.sr_I, current_tti);    
   
@@ -251,13 +252,11 @@ bool sched_ue::get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2], uint32
       uint32_t n_pucch = srslte_pucch_get_npucch(dl_harq[i].get_n_cce(), SRSLTE_PUCCH_FORMAT_1A, has_sr, &pucch_sched);
       if (prb_idx) {
         for (int i=0;i<2;i++) {
-          prb_idx[i] = srslte_pucch_n_prb(&cfg.pucch_cfg, SRSLTE_PUCCH_FORMAT_1A, n_pucch, cell.nof_prb, cell.cp, i); 
-        }      
+          prb_idx[i] = srslte_pucch_n_prb(&cfg.pucch_cfg, SRSLTE_PUCCH_FORMAT_1A, n_pucch, cell.nof_prb, cell.cp, i);
+        }
       }
-      if (L) {
-        *L = 1; 
-      }
-      Debug("SCHED: Reserved Format1A PUCCH for rnti=0x%x, n_prb=%d,%d, n_pucch=%d\n", rnti, prb_idx[0], prb_idx[1], n_pucch);
+      Info("SCHED: Reserved Format1A PUCCH for rnti=0x%x, n_prb=%d,%d, n_pucch=%d, ncce=%d, has_sr=%d, n_pucch_1=%d\n",
+           rnti, prb_idx[0], prb_idx[1], n_pucch, dl_harq[i].get_n_cce(), has_sr, pucch_sched.N_pucch_1);
       return true; 
     }
   }
@@ -268,10 +267,7 @@ bool sched_ue::get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2], uint32
         prb_idx[i] = srslte_pucch_n_prb(&cfg.pucch_cfg, SRSLTE_PUCCH_FORMAT_1, cfg.sr_N_pucch, cell.nof_prb, cell.cp, i); 
       }
     }
-    if (L) {
-      *L = 1; 
-    }
-    Debug("SCHED: Reserved Format1 PUCCH for rnti=0x%x, n_prb=%d,%d, n_pucch=%d\n", rnti, prb_idx[0], prb_idx[1], cfg.sr_N_pucch);
+    Info("SCHED: Reserved Format1 PUCCH for rnti=0x%x, n_prb=%d,%d, n_pucch=%d\n", rnti, prb_idx[0], prb_idx[1], cfg.sr_N_pucch);
     return true; 
   }
   // Finally check Format2 (periodic CQI)
@@ -281,10 +277,7 @@ bool sched_ue::get_pucch_sched(uint32_t current_tti, uint32_t prb_idx[2], uint32
         prb_idx[i] = srslte_pucch_n_prb(&cfg.pucch_cfg, SRSLTE_PUCCH_FORMAT_2, cfg.cqi_pucch, cell.nof_prb, cell.cp, i);
       }
     }
-    if(L) {
-      *L = 2;
-    }
-    Debug("SCHED: Reserved Format2 PUCCH for rnti=0x%x, n_prb=%d,%d, n_pucch=%d, pmi_idx=%d\n",
+    Info("SCHED: Reserved Format2 PUCCH for rnti=0x%x, n_prb=%d,%d, n_pucch=%d, pmi_idx=%d\n",
          rnti, prb_idx[0], prb_idx[1], cfg.cqi_pucch, cfg.cqi_idx);
     return true;
   }
diff --git a/srsenb/src/upper/rrc.cc b/srsenb/src/upper/rrc.cc
index b1280cf55..4a432b394 100644
--- a/srsenb/src/upper/rrc.cc
+++ b/srsenb/src/upper/rrc.cc
@@ -24,9 +24,10 @@
  *
  */
 
-#include <srslte/interfaces/sched_interface.h>
-#include <srslte/asn1/liblte_rrc.h>
-#include <upper/rrc.h>
+#include "srslte/interfaces/sched_interface.h"
+#include "srslte/asn1/liblte_rrc.h"
+#include "upper/rrc.h"
+#include "srslte/srslte.h"
 #include "srslte/asn1/liblte_mme.h"
 #include "upper/rrc.h"
 
@@ -1177,7 +1178,8 @@ void rrc::ue::send_connection_setup(bool is_setup)
   sched_cfg.pucch_cfg.delta_pucch_shift  = liblte_rrc_delta_pucch_shift_num[parent->sib2.rr_config_common_sib.pucch_cnfg.delta_pucch_shift%LIBLTE_RRC_DELTA_PUCCH_SHIFT_N_ITEMS];
   sched_cfg.pucch_cfg.N_cs               = parent->sib2.rr_config_common_sib.pucch_cnfg.n_cs_an;
   sched_cfg.pucch_cfg.n_rb_2             = parent->sib2.rr_config_common_sib.pucch_cnfg.n_rb_cqi;
-  
+  sched_cfg.pucch_cfg.n1_pucch_an        = parent->sib2.rr_config_common_sib.pucch_cnfg.n1_pucch_an;
+
   // Configure MAC 
   parent->mac->ue_cfg(rnti, &sched_cfg);