diff --git a/Makefile b/Makefile
index 95d8970..7078597 100644
--- a/Makefile
+++ b/Makefile
@@ -46,6 +46,7 @@
 	cp openflow build/openflow-lib
 	sed -i "s/from osm_openvim/from lib_osm_openvim/g" build/openflow-lib
 	sed -i "s/import osm_openvim/import lib_osm_openvim/g" build/openflow-lib
+	sed -i "s/__import__(\"osm_openvim\.\"/__import__(\"lib_osm_openvim\.\"/g" build/openflow-lib
 	sed -i "s/import osm_openvim; print osm_openvim\.__path__\[0\]/import lib_osm_openvim; print lib_osm_openvim\.__path__\[0\]/g" build/lib_osm_openvim/database_utils/migrate_vim_db.sh
 	sed -i "s/__import__(\"osm_openvim\.\"/__import__(\"lib_osm_openvim\.\"/g" build/lib_osm_openvim/ovim.py
 
diff --git a/openflow b/openflow
index 316ac0f..91ccf91 100755
--- a/openflow
+++ b/openflow
@@ -279,7 +279,7 @@
     of_controller_password = os.getenv('OF_CONTROLLER_PASSWORD',None)
     #of_controller_version = os.getenv('OF_CONTROLLER_VERSION',"0.90")
     of_controller_ip = os.getenv('OF_CONTROLLER_IP',"localhost")
-    of_controller_port = os.getenv('OF_CONTROLLER_PORT',"7070")
+    of_controller_port = os.getenv('OF_CONTROLLER_PORT',"8080")
     of_controller_dpid = os.getenv('OF_CONTROLLER_DPID','00:01:02:03:e4:05:e6:07')
     of_controller_module = os.getenv('OF_CONTROLLER_MODULE',None)