diff --git a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
index 64f87ca9d7ec460075cc526f75aa58ec5b6495f0..a98df19cf7c09fff4154fbbe481ec28b7f40bc51 100644
--- a/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
+++ b/targets/ARCH/LMSSDR/USERSPACE/LIB/lms_lib.cpp
@@ -138,7 +138,7 @@ int trx_lms_set_gains(openair0_device* device, openair0_config_t *openair0_cfg)
     ret = -1;
   }
   
-  LMS_SetNormalizedGain(lms_device, LMS_CH_TX, 0, .2);//openair0_cfg->tx_gain[0]);
+  LMS_SetGaindB(lms_device, LMS_CH_TX, 0, openair0_cfg->tx_gain[0]);
   LMS_SetGaindB(lms_device, LMS_CH_RX, 0, openair0_cfg->rx_gain[0]-openair0_cfg->rx_gain_offset[0]); 
 
   return(ret);
@@ -202,10 +202,11 @@ int trx_lms_start(openair0_device *device){
     }
     printf("Set TX frequency %f MHz\n",device->openair0_cfg[0].tx_freq[0]/1e6);
 
-    //printf("Override antenna settings to: RX1_H, TXA_2");
-    //LMS_SetAntenna(lms_device, LMS_CH_RX, 0, 1);
-    //LMS_SetAntenna(lms_device, LMS_CH_TX, 0, 2);
-
+    /*
+    printf("Override antenna settings to: RX1_H, TXA_2");
+    LMS_SetAntenna(lms_device, LMS_CH_RX, 0, 1);
+    LMS_SetAntenna(lms_device, LMS_CH_TX, 0, 2);
+    */
 
     
     for (int i = 0; i< device->openair0_cfg->rx_num_channels; i++)
@@ -354,7 +355,7 @@ int device_init(openair0_device *device, openair0_config_t *openair0_cfg){
     break;
   case 15360000:
     openair0_cfg[0].samples_per_packet    = 2048;
-    openair0_cfg[0].tx_sample_advance     = 70;
+    openair0_cfg[0].tx_sample_advance     = 450;
     openair0_cfg[0].tx_bw                 = 15.36e6;
     openair0_cfg[0].rx_bw                 = 15.36e6;
     break;
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf
index 5aa544cd8501a4880a2b49dc18a6c9ad563f4657..00f875ec4e2a27e50e7c9625a39c34d57a8d8ff1 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.25PRB.lmssdr.conf
@@ -17,7 +17,7 @@ eNBs =
 
     mobile_country_code =  "208";
 
-    mobile_network_code =  "92";
+    mobile_network_code =  "93";
 
        ////////// Physical parameters:
 
@@ -39,7 +39,7 @@ eNBs =
         nb_antenna_ports				      = 1;
         nb_antennas_tx          			      = 1;
         nb_antennas_rx          			      = 1;
-        tx_gain                                            = 20;
+        tx_gain                                            = 7;
         rx_gain                                            = 116;
         prach_root              			      = 0;
         prach_config_index      			      = 0;
@@ -50,7 +50,7 @@ eNBs =
         pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
-        pdsch_referenceSignalPower 			      = -30;
+        pdsch_referenceSignalPower 			      = -34;
         pdsch_p_b                  			      = 0;
         pusch_n_SB                 			      = 1;
         pusch_enable64QAM          			      = "DISABLE";
@@ -136,7 +136,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.70";
+    mme_ip_address      = ( { ipv4       = "192.168.12.148";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
diff --git a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
index d3ca6b90923af1cc4a36b213dbc23e1fea71d6a4..2d0e0f3702d8a7c43a40392aa068220234419b8f 100644
--- a/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
+++ b/targets/PROJECTS/GENERIC-LTE-EPC/CONF/enb.band7.tm1.50PRB.lmssdr.conf
@@ -17,7 +17,7 @@ eNBs =
 
     mobile_country_code =  "208";
 
-    mobile_network_code =  "92";
+    mobile_network_code =  "93";
 
        ////////// Physical parameters:
 
@@ -50,7 +50,7 @@ eNBs =
         pucch_nRB_CQI           			      = 1;
         pucch_nCS_AN            			      = 0;
         pucch_n1_AN             			      = 32;
-        pdsch_referenceSignalPower 			      = -36;
+        pdsch_referenceSignalPower 			      = -35;
         pdsch_p_b                  			      = 0;
         pusch_n_SB                 			      = 1;
         pusch_enable64QAM          			      = "DISABLE";
@@ -136,7 +136,7 @@ eNBs =
     };
 
     ////////// MME parameters:
-    mme_ip_address      = ( { ipv4       = "192.168.12.70";
+    mme_ip_address      = ( { ipv4       = "192.168.12.148";
                               ipv6       = "192:168:30::17";
                               active     = "yes";
                               preference = "ipv4";
diff --git a/targets/RT/USER/lte-enb.c b/targets/RT/USER/lte-enb.c
index 6f31f7842d54addeac8e82180f0b0e61362dfb27..21d34d40b194720ea2f5fa85cbf9a702707edf92 100644
--- a/targets/RT/USER/lte-enb.c
+++ b/targets/RT/USER/lte-enb.c
@@ -1560,7 +1560,7 @@ static void* eNB_thread_single( void* param ) {
   wait_sync("eNB_thread_single");
 
 #if defined(ENABLE_ITTI) && defined(ENABLE_USE_MME)
-  if (eNB->node_function < NGFI_RRU_IF5)
+  if ((eNB->node_function < NGFI_RRU_IF5) && (eNB->mac_enabled==1))
     wait_system_ready ("Waiting for eNB application to be ready %s\r", &start_eNB);
 #endif 
 
diff --git a/targets/RT/USER/lte-softmodem.c b/targets/RT/USER/lte-softmodem.c
index 8303d88218fbe0fbf83ab827133e3b29d355f5de..ecf7645808397cf368721cfbbb3d732ccad3c1a1 100644
--- a/targets/RT/USER/lte-softmodem.c
+++ b/targets/RT/USER/lte-softmodem.c
@@ -1726,7 +1726,7 @@ int main( int argc, char **argv ) {
 #if defined(ENABLE_ITTI)
 
     if ((UE_flag == 1)||
-            (node_function[0]<NGFI_RAU_IF4p5))
+	((node_function[0]<NGFI_RAU_IF4p5)&&(phy_test==0)))
         // don't create if node doesn't connect to RRC/S1/GTP
         if (create_tasks(UE_flag ? 0 : 1, UE_flag ? 1 : 0) < 0) {
             printf("cannot create ITTI tasks\n");