diff --git a/cmake/macros/MemoryDebugger.cmake b/cmake/macros/MemoryDebugger.cmake
index 3ec1d23d89..2fedc4e7dc 100644
--- a/cmake/macros/MemoryDebugger.cmake
+++ b/cmake/macros/MemoryDebugger.cmake
@@ -9,7 +9,7 @@
 
 macro(SETUP_MEMORY_DEBUGGER)
 if ("$ENV{VIRCADIA_MEMORY_DEBUGGING}")
-  if (DEFINED VIRCADIA_THREAD_DEBUGGING )
+  if (VIRCADIA_THREAD_DEBUGGING)
     message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
   endif()
 
diff --git a/cmake/macros/ThreadDebugger.cmake b/cmake/macros/ThreadDebugger.cmake
index 419755a42b..0353e3b1cb 100644
--- a/cmake/macros/ThreadDebugger.cmake
+++ b/cmake/macros/ThreadDebugger.cmake
@@ -9,18 +9,18 @@
 
 macro(SETUP_THREAD_DEBUGGER)
 if ("$ENV{VIRCADIA_THREAD_DEBUGGING}")
-  if (DEFINED VIRCADIA_MEMORY_DEBUGGING )
+  if (VIRCADIA_MEMORY_DEBUGGING )
     message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
   endif ()
 
-  SET( VIRCADIA_THREAD_DEBUGGING true )
+  SET(VIRCADIA_THREAD_DEBUGGING true)
 endif ()
 
 if (VIRCADIA_THREAD_DEBUGGING)
   if (UNIX)
     if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
         # for clang on Linux
-        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer" )
+        SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
         SET(CMAKE_EXE_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}")
         SET(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}")
     else ()
@@ -30,7 +30,7 @@ if (VIRCADIA_THREAD_DEBUGGING)
         SET(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}")
     endif()
   else()
-    message(FATAL_ERROR "Thread debugging is not supported on this platform." )
-  endif (UNIX)
+    message(FATAL_ERROR "Thread debugging is not supported on this platform.")
+  endif()
 endif ()
 endmacro(SETUP_THREAD_DEBUGGER)