diff --git a/windows_deliv/make_installations.btm b/windows_deliv/make_installations.btm
index 97452bc..fc45a75 100644
--- a/windows_deliv/make_installations.btm
+++ b/windows_deliv/make_installations.btm
@@ -123,7 +123,7 @@ if "%NO_GPL_BUILD%" NEQ "True" (
 		remtrace Missing GPL license text
 	endiff
 	7z a -t7z %INSTALL_DIR\setups\gpl\%STUDIO_NAME%_gpl_%SVN_VERSION-%ISE_PLATFORM%.7z %STUDIO_NAME% -mx9 >>& %INSTALL_LOG
-endiff
+)
 
 if "%NO_ENTERPRISE_BUILD%" NEQ "True" (
 	remtrace Enterprise archive
diff --git a/windows_deliv/set_aliases.btm b/windows_deliv/set_aliases.btm
index 722f1f1..75c17b0 100644
--- a/windows_deliv/set_aliases.btm
+++ b/windows_deliv/set_aliases.btm
@@ -20,7 +20,8 @@ endiff
 
 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%.%ISE_C_COMPILER_VER%
+	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%