diff --git a/windows_deliv/install/wix/install.bat b/windows_deliv/install/wix/install.bat
new file mode 100644
index 0000000..e20e3c2
--- /dev/null
+++ b/windows_deliv/install/wix/install.bat
@@ -0,0 +1,4 @@
+c:\apps\bin\junction "Windows Installer XML v3" C:\dev\es-deliv-scripts\windows_deliv\install\wix\v3.0
+c:\apps\bin\junction "C:\Program Files (x86)\MSBuild\Microsoft\WiX" C:\dev\es-deliv-scripts\windows_deliv\install\wix
+cd v3.0
+c:\apps\bin\junction bin %cd%
diff --git a/windows_deliv/make_delivery.btm b/windows_deliv/make_delivery.btm
index f2f897d..f909b51 100644
--- a/windows_deliv/make_delivery.btm
+++ b/windows_deliv/make_delivery.btm
@@ -201,6 +201,7 @@ cdd %STUDIO_DIR
 remtrace root
 exprt -N -r %PUBLIC_SVN_REVISION %DEFAULT_PUBLIC_SVN/Src/Delivery Delivery
 move Delivery\*.* . >>& %INSTALL_LOG
+give_time_to move Delivery files.
 fullrd Delivery >>& %INSTALL_LOG
 fullrf INSTALL README make_install compile_libraries
 remtrace eweasel (just the necessary)
@@ -300,8 +301,11 @@ iff not defined NO_COMPILE then
 	remtrace Update all libraries
 	iff isdir %EIFFEL_SRC then
 		remtrace Delete %EIFFEL_SRC
-		fullrd %EIFFEL_SRC
+		rename %EIFFEL_SRC% %EIFFEL_SRC%-deleting
+		fullrd %EIFFEL_SRC%-deleting
+		give_time_to remove %EIFFEL_SRC%
 	endiff
+
 	safe_md %EIFFEL_SRC
 
 	REM Clean up the files
diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm
index fc45a75..0693138 100644
--- a/windows_deliv/make_installations.btm
+++ b/windows_deliv/make_installations.btm
@@ -59,7 +59,9 @@ iff .%1.==.. then
 		cdd %EIFFEL_SRC
 		cd tools
 		if EXIST %INIT_DIR%\isesvn\tools\setup (
-			xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
+			if not EXIST setup (
+				xcopy %INIT_DIR%\isesvn\tools\setup setup /E /I
+			)
 		) else (
 			co %DEFAULT_ISE_SVN%/Src/tools/setup setup
 		)
diff --git a/windows_deliv/set_aliases.btm b/windows_deliv/set_aliases.btm
index 75c17b0..a558396 100644
--- a/windows_deliv/set_aliases.btm
+++ b/windows_deliv/set_aliases.btm
@@ -22,7 +22,6 @@ echo ISE_C_COMPILER_VER=%ISE_C_COMPILER_VER%
 iff defined ISE_C_COMPILER_VER then
 	set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140%
 ::	set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_VC_MSC%_%ISE_VC_MSC_VC140%.%ISE_C_COMPILER_VER%
-:: 	set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%.%ISE_C_COMPILER_VER%
 else
 	set WORK_DIR=%WORK_DIR%\%STUDIO_VERSION_MAJOR_MINOR%\%ISE_PLATFORM%
 endiff
diff --git a/windows_deliv/set_simple_aliases.btm b/windows_deliv/set_simple_aliases.btm
index 8df4151..3780152 100644
--- a/windows_deliv/set_simple_aliases.btm
+++ b/windows_deliv/set_simple_aliases.btm
@@ -43,8 +43,8 @@ alias cancel `echo Exiting... & echo Total time used: & echo %@TIMER[2] & set PA
 alias CANCEL_ON_ERROR `iff not "%DELIV_SKIP_ERROR%" == "True" then & CANCEL & endiff`
 
 REM CVS Commands: checkout, export
-alias co `call  %INIT_DIR\svn_command.bat co %$ >>& %INSTALL_LOG`
-alias exprt `call %INIT_DIR\svn_command.bat --force export %$ >>& %INSTALL_LOG`
+alias co `call  %INIT_DIR\svn_command.bat co --quiet %$ >>& %INSTALL_LOG`
+alias exprt `call %INIT_DIR\svn_command.bat --force export --quiet %$ >>& %INSTALL_LOG`
 REM We cannot redirect the output here, since the output is redirected to a file
 alias exprtfile `call %INIT_DIR\svn_command.bat cat %$` 
 
diff --git a/windows_deliv/svn_command.bat b/windows_deliv/svn_command.bat
index 7b5b727..64ab37b 100644
--- a/windows_deliv/svn_command.bat
+++ b/windows_deliv/svn_command.bat
@@ -6,6 +6,7 @@ set i=0
 :start
 if not "%i%"=="0" goto finish
 
+echo svn ... %*
 svn --config-option config:miscellany:use-commit-times=yes %*
 if not errorlevel 1 set i=1
 goto start