diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 5b1b31fafdde1666be34e0181e5dab077ab489ff..21676719a0efa6a9768c0e7849d290967f54a834 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -1,4 +1,4 @@
-
+#/*
 # * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
 # * contributor license agreements.  See the NOTICE file distributed with
 # * this work for additional information regarding copyright ownership.
@@ -1598,7 +1598,7 @@ class OaiCiTest():
 		return result
 
 	def Iperf_analyzeV2TCPOutput(self, lock, UE_IPAddress, device_id, statusQueue, iperf_real_options):
-		SSH.command('awk -f /tmp/tcp_iperf_stats.awk /tmp/CI-eNB/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
+		SSH.command('awk -f /tmp/tcp_iperf_stats.awk ' + EPC.SourceCodePath + '/scripts/iperf_' + self.testCase_id + '_' + device_id + '.log', '\$', 5)
 		result = re.search('Avg Bitrate : (?P<average>[0-9\.]+ Mbits\/sec) Max Bitrate : (?P<maximum>[0-9\.]+ Mbits\/sec) Min Bitrate : (?P<minimum>[0-9\.]+ Mbits\/sec)', SSH.getBefore())
 		if result is not None:
 			avgbitrate = result.group('average')
@@ -3161,7 +3161,7 @@ def GetParametersFromXML(action):
 			CiTestObj.air_interface = air_interface.lower() +'-softmodem'
 		else :
 			CiTestObj.air_interface = 'ocp-enb'
-		RAN.air_interface(CiTestObj.air_interface)
+		RAN.air_interface=CiTestObj.air_interface
 
 	if action == 'Terminate_eNB':
 		RAN.eNB_instance=test.findtext('eNB_instance')
@@ -3304,7 +3304,12 @@ def receive_signal(signum, frame):
 
 #loading xml action list from yaml
 import yaml
-with open('xml_class_list.yml','r') as file:
+xml_class_list_file=''
+if (os.path.isfile('xml_class_list.yml')):
+	xml_class_list_file='xml_class_list.yml'
+if (os.path.isfile('ci-scripts/xml_class_list.yml')):
+	xml_class_list_file='ci-scripts/xml_class_list.yml'
+with open(xml_class_list_file,'r') as file:
     # The FullLoader parameter handles the conversion from YAML
     # scalar values to Python the dictionary format
     xml_class_list = yaml.load(file,Loader=yaml.FullLoader)
diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index 23a004e4cec040a8f57ab961009a44035bc700f1..b1d26b8af34d5d2e80d8e27e56d31e5fedae7a17 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -536,7 +536,7 @@ class RANManagement():
 		# Make a copy and adapt to EPC / eNB IP addresses
 		mySSH.command('cp ' + full_config_file + ' ' + ci_full_config_file, '\$', 5)
 		if self.epcObj is not None:
-			localMmeIpAddr = self.epcObj.GetMmeIPAddress()
+			localMmeIpAddr = self.epcObj.MmeIPAddress
 			mySSH.command('sed -i -e \'s/CI_MME_IP_ADDR/' + localMmeIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_ENB_IP_ADDR/' + lIpAddr + '/\' ' + ci_full_config_file, '\$', 2);
 		mySSH.command('sed -i -e \'s/CI_RCC_IP_ADDR/' + self.eNBIPAddress + '/\' ' + ci_full_config_file, '\$', 2);
diff --git a/cmake_targets/build_oai b/cmake_targets/build_oai
index 469c840b4d01156dec27709ae2c5e4d057591b46..4c8399f4a9ff80322bfd3b1337946c10bde8fe51 100755
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -830,7 +830,7 @@ function main() {
   ####################################################
   # Build RF device and transport protocol libraries #
   ####################################################
-  if [ "$eNB" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" -o "$HWLAT" = "1" ] ; then
+  if [ "$eNB" = "1" -o "$eNBocp" = "1" -o "$UE" = "1" -o "$gNB" = "1" -o "$nrUE" = "1" -o "$HWLAT" = "1" ] ; then
 
       # build RF device libraries
       if [ "$HW" != "None" ] ; then