diff --git a/CMakeLists.txt b/CMakeLists.txt
index a7abd3f5bcc62a70058f300040c31a014a642cb0..99f219f7f2d5ea80ca681f91cb7dd958cfed2b16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,7 +65,7 @@ IF(NOT CLIENT_ONLY)
 
   SET(BOOST_COMPONENTS system thread regex)
   SEARCH_FOR_BOOST ()
-  FINDPYTHON(2.7 EXACT)
+  FINDPYTHON(3 REQUIRED)
 
   SET(CMAKE_INCLUDE_CURRENT_DIR ON)
   IF(USE_QT4)
diff --git a/src/gepetto/__init__.py b/src/gepetto/__init__.py
index 8ee9db8ee3d880502faa18e2e657c7bb9fb417c5..79f18887441fd39b41786418379a70a1becf7dc6 100644
--- a/src/gepetto/__init__.py
+++ b/src/gepetto/__init__.py
@@ -15,5 +15,5 @@
 # hpp-corbaserver.  If not, see
 # <http://www.gnu.org/licenses/>.
 
-from color import Color
-from quaternion import Quaternion
+from gepetto.color import Color
+from gepetto.quaternion import Quaternion
diff --git a/src/gepetto/corbaserver/__init__.py b/src/gepetto/corbaserver/__init__.py
index 7b40fdd1f95d57590b9279274f126ff31c900bfe..0d49773b46bea0adbd90ed74cc43bbb0f83fd355 100644
--- a/src/gepetto/corbaserver/__init__.py
+++ b/src/gepetto/corbaserver/__init__.py
@@ -1,7 +1,7 @@
 import omniORB
 omniORB.updateModule("gepetto.corbaserver")
 
-import graphical_interface_idl
+import gepetto.corbaserver.graphical_interface_idl
 
-from client import Client
+from gepetto.corbaserver.client import Client
 
diff --git a/src/gepetto/corbaserver/client.py b/src/gepetto/corbaserver/client.py
index 9a6f051a5b4e3d110ee9f847f4a1627d7005648d..a04b7cff4139b66c377d13901c1b09e5b572284a 100644
--- a/src/gepetto/corbaserver/client.py
+++ b/src/gepetto/corbaserver/client.py
@@ -32,7 +32,7 @@ class Client:
 
     try:
       obj = self.rootContext.resolve (name)
-    except CosNaming.NamingContext.NotFound, ex:
+    except CosNaming.NamingContext.NotFound:
       raise CorbaError (
         'failed to find the service ``{0}\'\''.format (serviceName [0]))