diff --git a/doc/CompileAllOptionPermutations.sh b/doc/CompileAllOptionPermutations.sh
index 4a844cad0b50a09c0a003a06f7e9798ebe3b696b..6d8a7b2656fd86b29aa92a9398941057b967b2ba 100755
--- a/doc/CompileAllOptionPermutations.sh
+++ b/doc/CompileAllOptionPermutations.sh
@@ -7,16 +7,21 @@ INSTALL_XERCESC=${SW}/xercesc;
 INSTALL_G4=${SW}/g4_10.01.p02_dbg/lib/Geant4-10.1.2;
 CHECKOUT=${dir_name}/../../DD4hep.trunk/checkout;
 GEANT_VERSION=10.01.p02;
-ROOT_VERSION=5.34.25
-ROOT_VERSION=6.04.10;
+#ROOT_VERSION=5.34.25
 
-#INSTALL_G4=${SW}/g4_10.02.p02_dbg/lib/Geant4-10.2.2;
-#GEANT_VERSION=10.02.p02;
-ROOT_VERSION=6.06.06;
-#source ${INSTALL_G4}/../../bin/geant4.sh;
+GEANT_VERSION=10.02.p02;
+INSTALL_G4=${SW}/g4_${GEANT_VERSION}_dbg/lib/Geant4-10.2.2;
+#ROOT_VERSION=6.06.06;
+ROOT_VERSION=6.08.00;
+source ${INSTALL_G4}/../../bin/geant4.sh;
 num_threads=2
-export CXX="`which g++-5` -D_GLIBCXX_USE_CXX11_ABI=0";
-export CC="`which gcc-5` -D_GLIBCXX_USE_CXX11_ABI=0";
+#
+# Root version < 6.08 : 
+#export CXX="`which g++-5` -D_GLIBCXX_USE_CXX11_ABI=0";
+#export CC="`which gcc-5` -D_GLIBCXX_USE_CXX11_ABI=0";
+#
+export CXX="`which g++-5`";
+export CC="`which gcc-5`";
 
 # ==============================================================================
 # Parse arguments
@@ -155,7 +160,9 @@ build_all()
                     OPTS="`make_opt ${DOGEANT4} -DDD4HEP_USE_GEANT4 -DGeant4_DIR=${INSTALL_G4}`\
 		    `make_opt ${DOLCIO}     -DDD4HEP_USE_LCIO -DLCIO_DIR=${INSTALL_LCIO}` \
 		    `make_opt ${DOXERCESC}  -DDD4HEP_USE_XERCESC -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
-                    -DDD4HEP_NO_REFLEX=ON -DDD4HEP_USE_CXX11=OFF \
+                    -DCLHEP_INCLUDE_DIR=${INSTALL_G4}/../../include/Geant4/CLHEP \
+                    -DCLHEP_LIBRARY=${INSTALL_G4}/libG4clhep.so \
+                    -DDD4HEP_NO_REFLEX=ON -DDD4HEP_USE_CXX11=ON \
                     -DROOTSYS=${ROOTSYS} -DCMAKE_INSTALL_PREFIX=${WORK_DIR}/DD4hep";
 		    CMD="cd ${dir_name}/$folder ; cmake ${BUILD_TYPE} ${OPTS} ${CHECKOUT};";
                     make_build;
@@ -166,7 +173,9 @@ build_all()
                     OPTS_ex="`make_opt ${DOGEANT4} -DDD4HEP_USE_GEANT4 -DGeant4_DIR=${INSTALL_G4}`\
 		    `make_opt ${DOLCIO}     -DDD4HEP_USE_LCIO    -DLCIO_DIR=${INSTALL_LCIO}` \
 		    `make_opt ${DOXERCESC}  -DDD4HEP_USE_XERCESC -DXERCESC_ROOT_DIR=${INSTALL_XERCESC}` \
-                    -DDD4HEP_NO_REFLEX=ON -DDD4HEP_USE_CXX11=OFF \
+                    -DCLHEP_INCLUDE_DIR=${INSTALL_G4}/../../include/Geant4/CLHEP \
+                    -DCLHEP_LIBRARY=${INSTALL_G4}/libG4clhep.so \
+                    -DDD4HEP_NO_REFLEX=ON -DDD4HEP_USE_CXX11=ON \
                     -DROOTSYS=${ROOTSYS}";
 		    source ${DD4hep_DIR}/bin/thisdd4hep.sh;
    		    CMD="cd ${WORK_DIR}/EX; cmake ${BUILD_TYPE} ${OPTS} -DDD4hep_DIR=${DD4hep_DIR} ${CHECKOUT}/examples;";
diff --git a/examples/AlignDet/CMakeLists.txt b/examples/AlignDet/CMakeLists.txt
index 3d59dca9eed549a46803dfea99943eafcbce4577..b001ec0e8e7d0af2e3a64217b9123a44bd1440bc 100644
--- a/examples/AlignDet/CMakeLists.txt
+++ b/examples/AlignDet/CMakeLists.txt
@@ -24,12 +24,13 @@ dd4hep_add_plugin( AlignDetExample SOURCES src/*.cpp  )
 dd4hep_install_dir( compact DESTINATION examples/AlignDet )
 dd4hep_configure_scripts( AlignDet DEFAULT_SETUP WITH_TESTS)
 
+if ( NEVER )
 #
 #---Testing: Load Telescope geometry and read conditions ------------------
 dd4hep_add_test_reg( test_AlignDet_Telescope_dump_geometry
   COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
   EXEC_ARGS  geoPluginRun -volmgr -destroy
-  -compact file:${CMAKE_CURRENT_SOURCE_DIR}/compact/Telescope.xml
+  -compact file:${DD4hep_DIR}/examples/AlignDetcompact/Telescope.xml
   -plugin DD4hepDetectorDump
   REGEX_PASS "/world/Telescope/module_9 NumDau\\:1 VolID\\:00000903 Place")
 #
@@ -53,7 +54,7 @@ dd4hep_add_test_reg( test_AlignDet_Telescope_read_xml
 dd4hep_add_test_reg( test_AlignDet_AlephTPC_load
   COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
   EXEC_ARGS  geoPluginRun
-             -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC.xml
+             -input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
              -destroy -no-interpreter -plugin DD4hep_GlobalAlignmentInstall
   REGEX_PASS "189 nodes/ 23 volume UID's in LCDD Geometry" )
 #
@@ -61,19 +62,21 @@ dd4hep_add_test_reg( test_AlignDet_AlephTPC_load
 dd4hep_add_test_reg( test_AlignDet_Global_AlephTPC_align
   COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
   EXEC_ARGS  geoPluginRun
-             -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC.xml
+             -input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
              -destroy -no-interpreter
              -plugin DD4hep_GlobalAlignmentInstall
-             -plugin DD4hepXMLLoader file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC_alignment.xml BUILD_DEFAULT
+             -plugin DD4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_alignment.xml BUILD_DEFAULT
   REGEX_PASS "Successfully parsed XML: AlephTPC_alignment.xml")
 #
 #---Testing: Load and misalign ALEPH TPC geometry -------------------------
 dd4hep_add_test_reg( test_AlignDet_Global_AlephTPC_reset
   COMMAND    "${CMAKE_INSTALL_PREFIX}/bin/run_test_AlignDet.sh"
   EXEC_ARGS  geoPluginRun
-             -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC.xml
+             -input file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC.xml
              -destroy -no-interpreter
              -plugin DD4hep_GlobalAlignmentInstall
-             -plugin DD4hepXMLLoader file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC_alignment.xml
-             -plugin DD4hepXMLLoader file:${CMAKE_CURRENT_SOURCE_DIR}/compact/AlephTPC_reset.xml
+             -plugin DD4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_alignment.xml
+             -plugin DD4hepXMLLoader file:${DD4hep_DIR}/examples/AlignDet/compact/AlephTPC_reset.xml
   REGEX_PASS "Successfully parsed XML: AlephTPC_reset.xml" )
+
+endif()