diff --git a/tools/gvm-lsc-deb-creator b/tools/gvm-lsc-deb-creator
index 44d44fac3..7b9bf955e 100755
--- a/tools/gvm-lsc-deb-creator
+++ b/tools/gvm-lsc-deb-creator
@@ -162,9 +162,7 @@ COPYRIGHT_FILE="${DOC_DATA_DIR}/copyright"
 } > "${COPYRIGHT_FILE}"
 
 # Create data archive
-cd "${DATA_DIR}"
-tar -C "${DATA_DIR}" -z -cf "../data.tar.gz" "${HOME_SUBDIR}" "${DOC_SUBDIR}"
-
+tar -P -z -cf "${TEMP_DIR}/data.tar.gz" "${PACKAGE_BASE_DIR}/${HOME_DATA_SUBDIR}" "${PACKAGE_BASE_DIR}/${DOC_DATA_SUBDIR}"
 
 #
 # Create control files
diff --git a/tools/gvm-lsc-rpm-creator b/tools/gvm-lsc-rpm-creator
index 813fe3695..474bf57ff 100755
--- a/tools/gvm-lsc-rpm-creator
+++ b/tools/gvm-lsc-rpm-creator
@@ -130,6 +130,8 @@ SPEC_FILE="${SPEC_DIR}/${PACKAGE_NAME_VERSION}.spec"
   echo "BuildArch: noarch"
   # Put output in current directory
   echo "%define _rpmdir %(pwd)"
+  # Set _topdir
+  echo "%define _topdir ${TEMP_DIR}"
 
   # Create description section
   echo "%description"
diff --git a/tools/template.nsis b/tools/template.nsis
index 5b9b5a2b0..7149fc2e7 100644
--- a/tools/template.nsis
+++ b/tools/template.nsis
@@ -65,9 +65,9 @@ Section
   ; Create user and add it to the Administrators group
   DetailPrint `Creating user ${__USERNAME__}`
   SetDetailsPrint none
-  ExecWait `cmd /C net user ${__USERNAME__} "${__PASSWORD__}" /add /active:yes`
+  ExecWait 'cmd /C net user ${__USERNAME__} "${__PASSWORD__}" /add /active:yes'
   SetDetailsPrint both
-  ExecWait `cmd /C net localgroup $ADMINGROUPNAME %COMPUTERNAME%\${__USERNAME__} /add`
+  ExecWait 'cmd /C net localgroup $ADMINGROUPNAME %COMPUTERNAME%\${__USERNAME__} /add'
 
   ; Remove temporary files for localized admin group names
   Delete $TEMPVBSFILE
@@ -81,7 +81,7 @@ SectionEnd
 ; Uninstaller section
 Section Uninstall
 
-  ExecWait "net user ${__USERNAME__} /delete"
+  ExecWait 'net user ${__USERNAME__} /delete'
 
   ; Display message that everything seems to be fine
   MessageBox MB_OK "A user has been removed. You can now safely remove the uninstaller from your Desktop."