diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b8807eb870743def85cf3342e04e8c56e20e9a3..50073d8a0016c0345e9ae7ae3cfc5507afb6ad14 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -49,6 +49,8 @@ option(USE_OPENMP "Include OpenMP support" ON)
 
 option(BUILD_VF_PYTHON_BINDINGS "" OFF)
 
+option(BUILD_VF_DOUBLE_ACCURACY "Use double accuracy" OFF)
+
 #################################################################################
 #  CMAKE POLICIES
 #################################################################################
@@ -66,6 +68,10 @@ endif()
 include(CMakePrintHelpers)
 include(${VF_CMAKE_DIR}/VirtualFluidsMacros.cmake)
 
+IF( BUILD_VF_DOUBLE_ACCURACY )
+    list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
+ENDIF()
+
 #################################################################################
 #  COMMON LIBRARIES
 #################################################################################
diff --git a/apps/gpu/tests/NumericalTests/CMakeLists.txt b/apps/gpu/tests/NumericalTests/CMakeLists.txt
index 6b66befe0107d6bd54ff95cf6a35f5373ff5975c..edb9dbe5b8420929124c8c10e3c3718862f0b1bc 100644
--- a/apps/gpu/tests/NumericalTests/CMakeLists.txt
+++ b/apps/gpu/tests/NumericalTests/CMakeLists.txt
@@ -8,9 +8,7 @@ groupTarget(${library_name} ${testFolder})
 if(BUILD_SHARED_LIBS)
     # add compile option according to
     # https://github.com/google/googletest/blob/master/googletest/README.md#as-a-shared-library-dll
-    set_target_properties(${library_name}
-            PROPERTIES
-            COMPILE_DEFINITIONS "GTEST_LINKED_AS_SHARED_LIBRARY=1")
+    target_compile_definitions (${library_name} PRIVATE "GTEST_LINKED_AS_SHARED_LIBRARY=1")
 endif()
 
 linkCUDA()
diff --git a/gpu.cmake b/gpu.cmake
index f68b8291db69bffecc16c5b317d46cf2914baac3..f4faec7286c94d1d96386c9e193c0c8acbf29f0b 100644
--- a/gpu.cmake
+++ b/gpu.cmake
@@ -12,16 +12,10 @@
 #############################################################
 option(VF.BUILD_VF_GPU          "Build VirtualFluids GPU"     ON )
 option(VF.BUILD_VF_GKS          "Build VirtualFluids GKS"     OFF )
-option(VF.BUILD_VF_TRAFFIC      "Build VirtualFluids Traffic" ON)
+option(VF.BUILD_VF_TRAFFIC      "Build VirtualFluids Traffic" OFF)
 option(VF.BUILD_JSONCPP         "Builds json cpp "            OFF)
 option(VF.BUILD_NUMERIC_TESTS   "Build numeric tests"         OFF)
 
-option(VF.BUILD_DOUBLE_ACCURACY "Use double accuracy"         OFF )
-
-IF( VF.BUILD_DOUBLE_ACCURACY )
-    list(APPEND VF_COMPILER_DEFINITION VF_DOUBLE_ACCURACY)
-ENDIF()
-
 #############################################################
 
 if(VF.BUILD_NUMERIC_TESTS)