diff --git a/windows_deliv/make_exes.btm b/windows_deliv/make_exes.btm
index 9af3013..a6af283 100644
--- a/windows_deliv/make_exes.btm
+++ b/windows_deliv/make_exes.btm
@@ -297,7 +297,7 @@ endiff
 remtrace get GDI+ for platforms that don't have it
 cdd %EIFFEL_SRC\tools
 if EXIST %INIT_DIR%\isesvn\tools\gdiplus (
-	xcopy %INIT_DIR%\isesvn\tools\gdiplus gdiplus /E /I
+	xcopy %INIT_DIR%\isesvn\tools\gdiplus gdiplus /E /I /Y
 ) else (
 	co %DEFAULT_ISE_SVN%/Src/tools/gdiplus gdiplus
 )
diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm
index 0693138..7808cae 100644
--- a/windows_deliv/make_installations.btm
+++ b/windows_deliv/make_installations.btm
@@ -27,35 +27,39 @@ endiff
 
 
 iff .%1.==.. then
-	remtrace =============================================
-	remtrace Checkout and compile the hallow tool
-	remtrace =============================================
-
-	cdd %EIFFEL_SRC\tools
-	remtrace Compile finish_freezing Clib
-	cd %EIFFEL_SRC\tools\finish_freezing\Clib
-	default_make
-
-	cdd %EIFFEL_SRC\tools
-	co -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/tools/hallow hallow
-	cd %EIFFEL_SRC\tools\hallow
-	clean_project
-	finalize hallow.ecf
-	cleanup_dotnet_eiffel hallow hallow.exe
-	iff not exist libhallow.dll then
-		remtrace Couldnt generate hallow.exe
-		CANCEL_ON_ERROR
+	iff exist %INIT_DIR%\install\bin\hallow.exe then
+		remtrace Reuse hallow tool
 	else
-		move hallow.exe %INIT_DIR\install\bin
-		move libhallow.dll %INIT_DIR\install\bin
-		move eiffelsoftware.runtime.dll %INIT_DIR\install\bin
+		remtrace =============================================
+		remtrace Checkout and compile the hallow tool
+		remtrace =============================================
+
+		cdd %EIFFEL_SRC\tools
+		remtrace Compile finish_freezing Clib
+		cd %EIFFEL_SRC\tools\finish_freezing\Clib
+		default_make
+
+		cdd %EIFFEL_SRC\tools
+		co -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/tools/hallow hallow
+		cd %EIFFEL_SRC\tools\hallow
+		clean_project
+		finalize hallow.ecf
+		cleanup_dotnet_eiffel hallow hallow.exe
+		iff not exist libhallow.dll then
+			remtrace Couldnt generate hallow.exe
+			CANCEL_ON_ERROR
+		else
+			move hallow.exe %INIT_DIR\install\bin
+			move libhallow.dll %INIT_DIR\install\bin
+			move eiffelsoftware.runtime.dll %INIT_DIR\install\bin
+		endiff
 	endiff
 
 	remtrace ==================================================
 	remtrace Recompile Custom actions for installation program
 	remtrace ==================================================
 
-	if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
+	iff not defined NO_ENTERPRISE_BUILD then
 		cdd %EIFFEL_SRC
 		cd tools
 		if EXIST %INIT_DIR%\isesvn\tools\setup (
@@ -77,7 +81,7 @@ iff .%1.==.. then
 		safe_md %INIT_DIR\install\binaries
 		safe_md %INIT_DIR\install\binaries\%WINNAME
 		move setup.dll %INIT_DIR\install\binaries\%WINNAME
-	)
+	endiff
 endiff
 
 remtrace ==============================================
@@ -101,13 +105,13 @@ if "%NO_GPL_BUILD%" NEQ "True" (
 	safe_copy %INIT_DIR\install\bin\studio_gpl_%WINNAME\package.msi %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.msi
 )
 
-if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
+iff not defined NO_ENTERPRISE_BUILD then
 	remtrace Preparing Commercial edition
 	remtrace Clean previous ENT WIX files
 	fullrd %INIT_DIR%\install\bin\studio_ent_%WINNAME%
 	espawn -u:%ISE_C_COMPILER_VER% "nmake /nologo enterprise_%WINNAME"
 	safe_copy %INIT_DIR\install\bin\studio_ent_%WINNAME\package.msi %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.msi
-)
+endiff
 
 
 remtrace ==============================================
@@ -127,7 +131,7 @@ if "%NO_GPL_BUILD%" NEQ "True" (
 	7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
 )
 
-if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
+iff not defined NO_ENTERPRISE_BUILD then
 	remtrace Enterprise archive
 	safe_copy %INSTALL_DIR\releases\enterprise_version\ec.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
 	safe_copy %INSTALL_DIR\releases\enterprise_version\ecb.exe %INSTALL_DIR\%STUDIO_NAME%\studio\spec\%ISE_PLATFORM%\bin
@@ -137,7 +141,7 @@ if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 		remtrace Missing Enterprise license text
 	endiff
 	7z a -t7z %INSTALL_DIR\setups\enterprise\%STUDIO_NAME%_ent_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
-)
+endiff
 
 remtrace Restoring the layout to its original state
 cdd %INSTALL_DIR