diff --git a/CMakeLists.txt b/CMakeLists.txt
index 32ca998..3f7a6bd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@ project(monofonIC)
 # include class submodule
 include(${CMAKE_CURRENT_SOURCE_DIR}/external/class.cmake)
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -march=native -Wall -fno-omit-frame-pointer -g  -fsanitize=address")
-#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -march=native -Wall -pedantic")
+# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O0 -march=native -Wall -fno-omit-frame-pointer -g  -fsanitize=address")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -march=native -Wall -pedantic")
 find_package(PkgConfig REQUIRED)
 
 set(CMAKE_MODULE_PATH
@@ -46,6 +46,7 @@ endif(ENABLE_MPI)
 
 
 # FFTW
+cmake_policy(SET CMP0074 NEW)
 find_package(FFTW3 REQUIRED)
 
 # GSL
diff --git a/FindFFTW3.cmake b/FindFFTW3.cmake
index 4a72c90..91f723b 100644
--- a/FindFFTW3.cmake
+++ b/FindFFTW3.cmake
@@ -13,7 +13,7 @@
 #UNSET(FFTW_MPI_LIBRARY CACHE)
 
 FIND_PATH(FFTW_INCLUDE_DIR fftw3.h
-  PATHS ${FFTW3_DIR}
+  PATHS ${FFTW3_DIR} ENV ${FFTW3_ROOT}
   PATH_SUFFIXES include
   DOC "Directory where the FFTW3 header files are located"
   NO_DEFAULT_PATH