diff --git a/openair1/PHY/LTE_TRANSPORT/pucch.c b/openair1/PHY/LTE_TRANSPORT/pucch.c
index 9783181fc40c57fbb7347e1e71a95b5f48384f99..bac836b68956f6a5bdef1dfd9e3cd7d7301c495f 100644
--- a/openair1/PHY/LTE_TRANSPORT/pucch.c
+++ b/openair1/PHY/LTE_TRANSPORT/pucch.c
@@ -149,11 +149,6 @@ void generate_pucch(mod_sym_t **txdataF,
     return;
   }
 
-  if (NRB2 > 2047) {
-    msg("[PHY] generate_pucch: Illegal NRB2 %d (should be 0...2047)\n",NRB2);
-    return;
-  }
-
   if (Ncs1_div_deltaPUCCH_Shift > 7) {
     msg("[PHY] generate_pucch: Illegal Ncs1_div_deltaPUCCH_Shift %d (should be 0...7)\n",Ncs1_div_deltaPUCCH_Shift);
     return;
@@ -476,11 +471,6 @@ int32_t rx_pucch(PHY_VARS_eNB *phy_vars_eNB,
     return(-1);
   }
 
-  if (NRB2 > 2047) {
-    LOG_E(PHY,"[eNB] rx_pucch: Illegal NRB2 %d (should be 0...2047)\n",NRB2);
-    return(-1);
-  }
-
   if (Ncs1_div_deltaPUCCH_Shift > 7) {
     LOG_E(PHY,"[eNB] rx_pucch: Illegal Ncs1_div_deltaPUCCH_Shift %d (should be 0...7)\n",Ncs1_div_deltaPUCCH_Shift);
     return(-1);
diff --git a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
index 55d2c10c7a35340f4bc0aa5f5e390334a6abe7c7..a250c3d58b1b63db75be3e4b7817df2c1a3116d4 100644
--- a/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
+++ b/targets/ARCH/USRP/USERSPACE/LIB/usrp_lib.cpp
@@ -112,6 +112,8 @@ static int trx_usrp_start(openair0_device *device)
   s->rx_count = 0;
   s->tx_count = 0;
   s->rx_timestamp = 0;
+
+  return 0;
 }
 
 static void trx_usrp_end(openair0_device *device)