diff --git a/openerp/service/__init__.py b/openerp/service/__init__.py
index 9fa1cf5c4f9..c387d272e26 100644
--- a/openerp/service/__init__.py
+++ b/openerp/service/__init__.py
@@ -71,7 +71,7 @@ def start_services():
     openerp.netsvc.Server.startAll()
 
     # Start the WSGI server.
-    openerp.wsgi.start_server()
+    openerp.wsgi.core.start_server()
 
 
 def stop_services():
@@ -80,7 +80,7 @@ def stop_services():
     openerp.cron.cancel_all()
 
     openerp.netsvc.Server.quitAll()
-    openerp.wsgi.stop_server()
+    openerp.wsgi.core.stop_server()
     config = openerp.tools.config
     _logger.info("Initiating shutdown")
     _logger.info("Hit CTRL-C again or send a second signal to force the shutdown.")
diff --git a/openerp/wsgi/__init__.py b/openerp/wsgi/__init__.py
index 309d0c757f2..a536ee57327 100644
--- a/openerp/wsgi/__init__.py
+++ b/openerp/wsgi/__init__.py
@@ -27,4 +27,7 @@ This module offers a WSGI interface to/from OpenERP.
 
 from . import core
 
+# TODO: This is for the web addons, can be removed later.
+register_wsgi_handler = core.register_wsgi_handler
+
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/openerp/wsgi/core.py b/openerp/wsgi/core.py
index a832a525d9c..986222596e9 100644
--- a/openerp/wsgi/core.py
+++ b/openerp/wsgi/core.py
@@ -421,7 +421,6 @@ def serve():
     # TODO Change the xmlrpc_* options to http_*
     interface = config['xmlrpc_interface'] or '0.0.0.0'
     port = config['xmlrpc_port']
-    proxy_msg = ' in proxy mode' if config['proxy_mode'] else ''
     try:
         import werkzeug.serving
         if config['proxy_mode']:
@@ -448,7 +447,7 @@ def start_server():
 
     The WSGI server can be shutdown with stop_server() below.
     """
-    threading.Thread(target=openerp.wsgi.serve).start()
+    threading.Thread(target=serve).start()
 
 def stop_server():
     """ Initiate the shutdown of the WSGI server.