diff --git a/AMDiS/cmake/enable_cxx11.cmake b/AMDiS/cmake/enable_cxx11.cmake
index 593f1b5be1749591ab393fb96ae59519611b747d..40aee58b328de48a40742a24249ed50af6047730 100644
--- a/AMDiS/cmake/enable_cxx11.cmake
+++ b/AMDiS/cmake/enable_cxx11.cmake
@@ -5,12 +5,14 @@ if (ENABLE_CXX11)
     if (${CMAKE_VERSION} VERSION_GREATER "3.0")
         set(CMAKE_CXX_STANDARD 11)
         set(CMAKE_CXX_STANDARD_REQUIRED ON)
-        set(REQUIRED_CXX_FEATURES "cxx_alias_templates" "cxx_auto_type" "cxx_lambdas" "cxx_override" "cxx_range_for" "cxx_static_assert" "cxx_variadic_templates")
-	
-	add_library(test_compiler_features cmake/dummy.cc)
-	foreach(feature ${REQUIRED_CXX_FEATURES})
-	    target_compile_features(test_compiler_features PUBLIC ${feature})
-        endforeach(feature)
+        if (NOT "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel") # cmake can not detect intel compile features
+          set(REQUIRED_CXX_FEATURES "cxx_alias_templates" "cxx_auto_type" "cxx_lambdas" "cxx_override" "cxx_range_for" "cxx_static_assert" "cxx_variadic_templates")
+
+          add_library(test_compiler_features cmake/dummy.cc)
+          foreach(feature ${REQUIRED_CXX_FEATURES})
+              target_compile_features(test_compiler_features PUBLIC ${feature})
+          endforeach(feature)
+        endif ()
     else()
         if (CMAKE_COMPILER_IS_GNUCXX)
             set(GXX_MIN_VER "4.8")
diff --git a/AMDiS/cmake/enable_parallel_domain.cmake b/AMDiS/cmake/enable_parallel_domain.cmake
index 562ff0ac649e7c0f4bf73a6ccc6714b2aec554b5..035ed4548e9d82e22902f82aa0ef714e896df52e 100644
--- a/AMDiS/cmake/enable_parallel_domain.cmake
+++ b/AMDiS/cmake/enable_parallel_domain.cmake
@@ -72,7 +72,7 @@ if (ENABLE_PARALLEL_DOMAIN)
 		${SOURCE_DIR}/parallel/ZoltanPartitioner.cc)
 
 	if(ENABLE_PARALLEL_DOMAIN STREQUAL "PETSC")
-		set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};/usr/share/cmake-2.8/Modules/;${CMAKE_SOURCE_DIR}/")
+		set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH};/usr/share/cmake-2.8/Modules/;${AMDIS_SOURCE_DIR}/cmake")
 		set(PETSC_EXECUTABLE_RUNS ON)
 		find_package(PETSc REQUIRED)
 		include_directories(${PETSC_DIR}/include ${PETSC_DIR}/${PETSC_ARCH}/include)