diff --git a/bootstrap/build.conf b/bootstrap/build.conf
index 8c57eaf7..82fa9fad 100644
--- a/bootstrap/build.conf
+++ b/bootstrap/build.conf
@@ -4,7 +4,7 @@
 # inside a Python function.
 
 
-svnconfig  = { 'method':'svn+ssh://coriolis.soc.lip6.fr' }
+svnconfig  = { 'method':'svn+ssh://bip.soc.lip6.fr' }
 
 projectdir = 'coriolis-2.x'
 
diff --git a/bootstrap/cmake_modules/CMakeLists.txt b/bootstrap/cmake_modules/CMakeLists.txt
index a9fbadd5..8bcaa982 100644
--- a/bootstrap/cmake_modules/CMakeLists.txt
+++ b/bootstrap/cmake_modules/CMakeLists.txt
@@ -4,6 +4,7 @@
                    FindPythonSitePackages.cmake
                    FindLEFDEF.cmake
                    FindBootstrap.cmake
+                   FindLibexecinfo.cmake
          )
                
  install ( FILES ${finders} DESTINATION share/cmake/Modules ) 
diff --git a/bootstrap/cmake_modules/FindBootstrap.cmake b/bootstrap/cmake_modules/FindBootstrap.cmake
index b2e447f4..fbb6bc2f 100644
--- a/bootstrap/cmake_modules/FindBootstrap.cmake
+++ b/bootstrap/cmake_modules/FindBootstrap.cmake
@@ -73,8 +73,8 @@
 #
  set(CMAKE_C_FLAGS_DEBUG     "-g -Wall"           CACHE STRING "Debug options."   FORCE)
  set(CMAKE_CXX_FLAGS_DEBUG   "-g -Wall"           CACHE STRING "Debug options."   FORCE)
- set(CMAKE_C_FLAGS_RELEASE   "-O3 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
- set(CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
+ set(CMAKE_C_FLAGS_RELEASE   "-O2 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
+ set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG -Wall" CACHE STRING "Release options." FORCE)
 
 
 #
diff --git a/bootstrap/coriolisEnv.py b/bootstrap/coriolisEnv.py
index c01b3a7a..d585f2da 100755
--- a/bootstrap/coriolisEnv.py
+++ b/bootstrap/coriolisEnv.py
@@ -173,6 +173,7 @@ if __name__ == "__main__":
       sitePackagesDir = "%s/python%s/dist-packages" % (absLibDir,version)
 
     strippedPythonPath = "%s:"         % (sitePackagesDir) + strippedPythonPath
+    strippedPythonPath = "%s/crlcore:" % (sitePackagesDir) + strippedPythonPath
     strippedPythonPath = "%s/cumulus:" % (sitePackagesDir) + strippedPythonPath
     strippedPythonPath = "%s/stratus:" % (sitePackagesDir) + strippedPythonPath