diff --git a/Makefile b/Makefile
index 8a4c3aa95..565816630 100644
--- a/Makefile
+++ b/Makefile
@@ -111,10 +111,8 @@ endif
 # Include tools installers
 include $(ROOT_DIR)/make/tools.mk
 
-# Include third party builders
-ifneq ("$(wildcard $(ROOT_DIR)/make/3rdparty/3rdparty.mk)","")
-	include $(ROOT_DIR)/make/3rdparty/3rdparty.mk
-endif
+# Include third party builders if available
+-include $(ROOT_DIR)/make/3rdparty/3rdparty.mk
 
 # We almost need to consider autoconf/automake instead of this
 ifeq ($(UNAME), Linux)
diff --git a/make/tools.mk b/make/tools.mk
index c67c5ead6..19abb3ebe 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -932,10 +932,9 @@ gtest_version:
 $(eval $(call TOOL_INSTALL_TEMPLATE,cmake,$(CMAKE_DIR),$(CMAKE_URL),$(CMAKE_MD5_URL),$(notdir $(CMAKE_URL))))
 
 ifeq ($(shell [ -d "$(CMAKE_DIR)" ] && $(ECHO) "exists"), exists)
-    export CMAKE := "$(CMAKE_DIR)/bin/cmake"
+    export CMAKE := $(CMAKE_DIR)/bin/cmake
     export PATH := $(CMAKE_DIR)/bin:$(PATH)
 else
-    export CMAKE := "cmake"
     # not installed, hope it's in the path...
     #$(info $(EMPTY) WARNING     $(call toprel, $(CMAKE_DIR)) not found (make cmake_install), using system PATH)
     export CMAKE := cmake
@@ -943,7 +942,7 @@ endif
 
 .PHONY: cmake_version
 cmake_version:
-	-$(V1) $(ECHO) "`$(CMAKE) --version`"
+	-$(V1) $(CMAKE) --version
 
 ##############################
 #
@@ -956,7 +955,7 @@ ifeq ($(UNAME), Windows)
 $(eval $(call TOOL_INSTALL_TEMPLATE,msys,$(MSYS_DIR),$(MSYS_URL),,$(notdir $(MSYS_URL))))
 
 ifeq ($(shell [ -d "$(MSYS_DIR)" ] && $(ECHO) "exists"), exists)
-    export MSYS_DIR := $(MSYS_DIR)
+    export MSYS_DIR
 else
     # not installed, hope it's in the path...
     #$(info $(EMPTY) WARNING     $(call toprel, $(MSYS_DIR)) not found (make msys_install), using system PATH)