diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 6cda67db2d..ed66ab1ed1 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -20,7 +20,7 @@ endfunction()
 
 if (BUILD_TOOLS)
     # Allow different tools for stable builds
-    if (RELEASE_TYPE STREQUAL "PRODUCTION")
+    if (NOT STABLE_BUILD)
         set(ALL_TOOLS 
             udt-test 
             vhacd-util
diff --git a/tools/nitpick/CMakeLists.txt b/tools/nitpick/CMakeLists.txt
index e69b16b866..44eace5e70 100644
--- a/tools/nitpick/CMakeLists.txt
+++ b/tools/nitpick/CMakeLists.txt
@@ -80,7 +80,9 @@ else ()
     add_executable(${TARGET_NAME} ${NITPICK_SRCS} ${QM})
 endif ()
 
-add_dependencies(${TARGET_NAME} resources)
+if (NOT UNIX)
+    add_dependencies(${TARGET_NAME} resources)
+endif()
 
 # disable /OPT:REF and /OPT:ICF for the Debug builds
 # This will prevent the following linker warnings