diff --git a/CMakeLists.txt b/CMakeLists.txt
index 19fa5dd..3b559c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -172,5 +172,4 @@ TARGET_LINK_LIBRARIES( openEMS
 INSTALL( TARGETS openEMS DESTINATION bin )
 
 INSTALL( DIRECTORY matlab DESTINATION share/openEMS )
-
 # TODO mpi, tarball, debug, release
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 145374a..0b3abfe 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 INCLUDE_DIRECTORIES( ${openEMS_SOURCE_DIR} )
-INCLUDE_DIRECTORIES( ${CSXCAD_SOURCE_DIR}/src )
 
 set( SOURCES
   engine_interface_base.cpp
diff --git a/FDTD/CMakeLists.txt b/FDTD/CMakeLists.txt
index 598a1d7..a84d8b9 100644
--- a/FDTD/CMakeLists.txt
+++ b/FDTD/CMakeLists.txt
@@ -1,6 +1,5 @@
 
 INCLUDE_DIRECTORIES( ${openEMS_SOURCE_DIR} )
-INCLUDE_DIRECTORIES( ${CSXCAD_SOURCE_DIR}/src )
 
 set(SOURCES
   engine.cpp
diff --git a/nf2ff/CMakeLists.txt b/nf2ff/CMakeLists.txt
index b8f0dfa..a9ddef1 100644
--- a/nf2ff/CMakeLists.txt
+++ b/nf2ff/CMakeLists.txt
@@ -1,4 +1,11 @@
 
+# define build type
+IF( DEFINED CMAKE_BUILD_TYPE )
+  SET( CMAKE_BUILD_TYPE ${CMAKE_BUILD_TYPE} CACHE STRING "Set to either \"Release\" or \"Debug\"" )
+ELSE()
+  SET( CMAKE_BUILD_TYPE Release CACHE STRING "Set to either \"Release\" or \"Debug\"" )
+ENDIF()
+
 PROJECT(nf2ff CXX)
 cmake_minimum_required(VERSION 2.8)