diff --git a/make/defs.mk b/make/defs.mk
index e0d1cfc1..7b557497 100644
--- a/make/defs.mk
+++ b/make/defs.mk
@@ -251,25 +251,25 @@ ifeq ($(TARGET),mingw)
   CROSS_TOOL_DIR      ?= /opt/cross-tools
   CROSS_TOOL_BIN_PREFIX ?= $(CROSS_TOOL_DIR)/bin/i686-pc-mingw32-
  endif
-GCC                   ?= $(CROSS_TOOL_BIN_PREFIX)gcc
-GPP                   ?= $(CROSS_TOOL_BIN_PREFIX)g++
-CLANG                 ?= $(CROSS_TOOL_BIN_PREFIX)clang
-CLANGPP               ?= $(CROSS_TOOL_BIN_PREFIX)clang++
-STRIP                 ?= $(CROSS_TOOL_BIN_PREFIX)strip
-RANLIB                ?= $(CROSS_TOOL_BIN_PREFIX)ranlib
-AR                    ?= $(CROSS_TOOL_BIN_PREFIX)ar
-WINDRES               ?= $(CROSS_TOOL_BIN_PREFIX)windres
-BUILD_LDFLAGS         += -lws2_32
-USE_GFILTER           ?= false
-MS_LD                 ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
+ GCC                  ?= $(CROSS_TOOL_BIN_PREFIX)gcc
+ GPP                  ?= $(CROSS_TOOL_BIN_PREFIX)g++
+ CLANG                ?= $(CROSS_TOOL_BIN_PREFIX)clang
+ CLANGPP              ?= $(CROSS_TOOL_BIN_PREFIX)clang++
+ STRIP                ?= $(CROSS_TOOL_BIN_PREFIX)strip
+ RANLIB               ?= $(CROSS_TOOL_BIN_PREFIX)ranlib
+ AR                   ?= $(CROSS_TOOL_BIN_PREFIX)ar
+ WINDRES              ?= $(CROSS_TOOL_BIN_PREFIX)windres
+ BUILD_LDFLAGS        += -lws2_32
+ USE_GFILTER          ?= false
+ MS_LD                ?= wine $(HOME)/local/mingw/packages/msvcpp/bin/LIB.EXE
 else
-GCC                   ?= gcc
-GPP                   ?= g++
-CLANG                 ?= clang
-CLANGPP               ?= clang++
-STRIP                 ?= strip
-RANLIB                ?= ranlib
-AR                    ?= ar
+ GCC                  ?= gcc
+ GPP                  ?= g++
+ CLANG                ?= clang
+ CLANGPP              ?= clang++
+ STRIP                ?= strip
+ RANLIB               ?= ranlib
+ AR                   ?= ar
 endif
 
 # makefile helpers
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index fb39a221..9d37ded3 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -44,13 +44,13 @@ GET_OS_SH             = /bin/bash $(firstword $(wildcard $(MOD_SCRIPT_DIR)/get-o
 SSH_WRAPPER_SH       := $(CWD)/ssh-wrapper.sh
 
 EXCLUDES_FILE        ?= exclude.txt
-EXCLUDES_FILES        = exclude-$(shell $(GET_OS_SH) name).txt exclude-$(shell $(GET_OS_SH)).txt $(EXCLUDES_FILE)
-TEXT_FILES_CACHE     ?= text-files.txt
-
-ifneq ($(wildcard $(EXCLUDES_FILES)),)
-  EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(wildcard $(EXCLUDES_FILES)))
+EXCLUDES_FILES        = $(wildcard exclude-$(shell $(GET_OS_SH) name 2>/dev/null).txt exclude-$(shell $(GET_OS_SH) 2>/dev/null).txt $(EXCLUDES_FILE))
+ifneq ($(EXCLUDES_FILES),)
+  EXCLUDE_FROM_BUILD += $(shell sed 's/\#.*//g' $(EXCLUDES_FILES))
 endif
 
+TEXT_FILES_CACHE     ?= text-files.txt
+
 ifndef JANWARE_USER
   ifneq ($(wildcard CVS/Root),)
     JANWARE_USER = $(shell sed '/^:ext/ !d; s/:ext:\([^@]\+\)@.*/\1/' CVS/Root)
@@ -78,7 +78,7 @@ endif
 
 export GIT_SSH := $(CVS_RSH)
 ifeq ($(filter pkg-%,$(MAKECMDGOALS)),)
-  export JW_BUILD_SSH_EXTRA_OPTS += -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%p -o ControlPersist=3m -l $(JANWARE_USER)
+  export JW_BUILD_SSH_EXTRA_OPTS += -o ControlMaster=auto -o ControlPath=/tmp/%r@jw-build:%h:%p -o ControlPersist=3m -l $(JANWARE_USER)
 endif
 
 ifneq ($(CLONE_FROM_USER),)