diff --git a/hurricane/cmake_modules/CMakeLists.txt b/hurricane/cmake_modules/CMakeLists.txt
index 00bab25f..3730b4f3 100644
--- a/hurricane/cmake_modules/CMakeLists.txt
+++ b/hurricane/cmake_modules/CMakeLists.txt
@@ -1,2 +1 @@
-install(FILES FindHURRICANE.cmake FindBISON.cmake FindFLEX.cmake
-        DESTINATION share/cmake_modules) 
+install(FILES FindHURRICANE.cmake FindBISON.cmake FindFLEX.cmake DESTINATION share/cmake/Modules) 
diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake
index 37f0635a..fa6e5afa 100644
--- a/hurricane/cmake_modules/FindHURRICANE.cmake
+++ b/hurricane/cmake_modules/FindHURRICANE.cmake
@@ -87,7 +87,7 @@ IF(UNIX)
   FIND_PATH(HURRICANE_INCLUDE_PATH NAMES hurricane/Cell.h PATHS
     # Look in other places.
     ${CORIOLIS_DIR_SEARCH}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES include/coriolis2 include
     # Help the user find it if we cannot.
     DOC "${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
   )
@@ -103,7 +103,7 @@ IF(UNIX)
   FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
     NAMES hurricane/viewer/CellWidget.h
     PATHS ${CORIOLIS_DIR_SEARCH}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES include/coriolis2 include
     # Help the user find it if we cannot.
     DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
   )
@@ -119,7 +119,7 @@ IF(UNIX)
   FIND_PATH(HURRICANE_PYTHON_INCLUDE_PATH
     NAMES hurricane/isobar/PyCell.h
     PATHS ${CORIOLIS_DIR_SEARCH}
-    PATH_SUFFIXES include
+    PATH_SUFFIXES include/coriolis2 include
     # Help the user find it if we cannot.
     DOC "${HURRICANE_LIBRARY_PATH_DESCRIPTION}"
   )
diff --git a/hurricane/doc/hurricane/CMakeLists.txt b/hurricane/doc/hurricane/CMakeLists.txt
index 00890b5a..aff69438 100644
--- a/hurricane/doc/hurricane/CMakeLists.txt
+++ b/hurricane/doc/hurricane/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-               set ( htmlInstallDir  share/doc/en/html/hurricane )
-               set ( latexInstallDir share/doc/en/latex/hurricane )
+               set ( htmlInstallDir  share/doc/coriolis2/en/html/hurricane )
+               set ( latexInstallDir share/doc/coriolis2/en/latex/hurricane )
 
  add_custom_target ( doc ALL cd ${HURRICANE_SOURCE_DIR}/doc/hurricane && ${DOXYGEN_EXECUTABLE} doxyfile )
 
diff --git a/hurricane/doc/viewer/CMakeLists.txt b/hurricane/doc/viewer/CMakeLists.txt
index 689d239d..e31fbbf1 100644
--- a/hurricane/doc/viewer/CMakeLists.txt
+++ b/hurricane/doc/viewer/CMakeLists.txt
@@ -1,6 +1,6 @@
 
-               set ( htmlInstallDir  share/doc/en/html/viewer )
-               set ( latexInstallDir share/doc/en/latex/viewer )
+               set ( htmlInstallDir  share/doc/coriolis2/en/html/viewer )
+               set ( latexInstallDir share/doc/coriolis2/en/latex/viewer )
 
  add_custom_target ( documentation ALL cd ${HURRICANE_SOURCE_DIR}/doc/viewer && ${DOXYGEN_EXECUTABLE} doxyfile )
 
diff --git a/hurricane/src/hurricane/CMakeLists.txt b/hurricane/src/hurricane/CMakeLists.txt
index 69ab2ac0..bbbec097 100644
--- a/hurricane/src/hurricane/CMakeLists.txt
+++ b/hurricane/src/hurricane/CMakeLists.txt
@@ -152,4 +152,4 @@
     
           add_library ( hurricane ${cpps} )
               install ( TARGETS hurricane DESTINATION lib${LIB_SUFFIX} )
-              install ( FILES ${includes} DESTINATION include/hurricane ) 
+              install ( FILES ${includes} DESTINATION include/coriolis2/hurricane ) 
diff --git a/hurricane/src/isobar/CMakeLists.txt b/hurricane/src/isobar/CMakeLists.txt
index 9e4bd461..d68c71bd 100644
--- a/hurricane/src/isobar/CMakeLists.txt
+++ b/hurricane/src/isobar/CMakeLists.txt
@@ -80,7 +80,7 @@
                        )
 
 
-               install ( FILES   ${includes} DESTINATION include/hurricane/isobar )
+               install ( FILES   ${includes} DESTINATION include/coriolis2/hurricane/isobar )
 
            add_library ( isobar ${sources} )
  target_link_libraries ( isobar hurricane ${PYTHON_LIBRARIES} -lutil )
diff --git a/hurricane/src/viewer/CMakeLists.txt b/hurricane/src/viewer/CMakeLists.txt
index e83f8d29..2ef6a8b9 100644
--- a/hurricane/src/viewer/CMakeLists.txt
+++ b/hurricane/src/viewer/CMakeLists.txt
@@ -109,7 +109,7 @@
           qt4_wrap_cpp ( MOC_SRCS    ${mocincludes} )
      qt4_add_resources ( RCC_SRCS    CellViewer.qrc )
 
-               install ( FILES           ${exports}     DESTINATION include/hurricane/viewer ) 
+               install ( FILES           ${exports}     DESTINATION include/coriolis2/hurricane/viewer ) 
 
            add_library ( viewer          ${cpps} ${MOC_SRCS} ${RCC_SRCS} )
  target_link_libraries ( viewer          hurricane
diff --git a/hurricane/src/viewer/RecordModel.cpp b/hurricane/src/viewer/RecordModel.cpp
index 08a90a0d..61a8e5f4 100644
--- a/hurricane/src/viewer/RecordModel.cpp
+++ b/hurricane/src/viewer/RecordModel.cpp
@@ -126,9 +126,9 @@ namespace Hurricane {
     }
 
     if ( role == Qt::DisplayRole ) {
-      int   row  = index.row ();
+      int row = index.row ();
     //Slot* slot = _record->getSlot ( row );
-      if ( row < _cache.size() ) {
+      if ( row < (int)_cache.size() ) {
         switch ( index.column() ) {
           case 0: return _cache[row].first;
           case 1: return _cache[row].second;