Index: scripts/jenkins/prepare-portable-package.bat
===================================================================
diff -u -r5b51ecf1bc163ceb70034df145667b6157f01ce3 -rcd221ea932b80fcf38ac065aef9928d1a4245802
--- scripts/jenkins/prepare-portable-package.bat	(.../prepare-portable-package.bat)	(revision 5b51ecf1bc163ceb70034df145667b6157f01ce3)
+++ scripts/jenkins/prepare-portable-package.bat	(.../prepare-portable-package.bat)	(revision cd221ea932b80fcf38ac065aef9928d1a4245802)
@@ -5,8 +5,6 @@
 
 SET TmpDir=%WORKSPACE%\temp\chzip-%BUILD_NUMBER%
 
-SET VSInstallDirX86=C:\Program Files (x86)\Microsoft Visual Studio 14.0
-
 mkdir "%TmpDir%"
 
 rem Prepare 32bit build
Index: scripts/setup.iss
===================================================================
diff -u -rc1fe744c16ec88e191e1eea52825ea688d3547ee -rcd221ea932b80fcf38ac065aef9928d1a4245802
--- scripts/setup.iss	(.../setup.iss)	(revision c1fe744c16ec88e191e1eea52825ea688d3547ee)
+++ scripts/setup.iss	(.../setup.iss)	(revision cd221ea932b80fcf38ac065aef9928d1a4245802)
@@ -164,15 +164,14 @@
 Name: {group}\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; WorkingDir: {app}
 Name: {group}\{cm:TranslateCopyHandler}; Filename: {app}\{code:ExpandArch|ICTranslateFilename}; Parameters: """{app}\langs\english.lng"""; WorkingDir: {app}\lang
 Name: {group}\{cm:UninstallCopyHandler}; Filename: {uninstallexe}; WorkingDir: {app}
-Name: {userdesktop}\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: desktopicon; WorkingDir: {app}
-Name: {userappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: quicklaunchicon; WorkingDir: {app}
+Name: {commondesktop}\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: desktopicon; WorkingDir: {app}
+Name: {commonappdata}\Microsoft\Internet Explorer\Quick Launch\{#MyAppName}; Filename: {app}\{code:ExpandArch|ExeFilename}; Tasks: quicklaunchicon; WorkingDir: {app}
 
 [Run]
 Filename: "{app}\{code:ExpandArch|ExeFilename}"; Flags: nowait postinstall skipifsilent; Description: "{cm:LaunchProgram,{#MyAppName}}"
 
 [Registry]
 Root: "HKLM"; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: none; ValueName: "Copy Handler"; Flags: deletevalue uninsdeletevalue
-Root: "HKCU"; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\Run"; ValueType: none; ValueName: "Copy Handler"; Flags: uninsdeletevalue
 
 [Dirs]
 Name: {app}\help; Flags: uninsalwaysuninstall