diff --git a/release/linux/build_installer_linux.sh b/release/linux/build_installer_linux.sh
index 9f96fcdd..bb4cb1f3 100755
--- a/release/linux/build_installer_linux.sh
+++ b/release/linux/build_installer_linux.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+set -e -u
 
 # Build the installer for Linux.
 # This script must be run from the root of the repository.
diff --git a/release/linux/build_package_linux.sh b/release/linux/build_package_linux.sh
index 67f7f418..c21cd438 100755
--- a/release/linux/build_package_linux.sh
+++ b/release/linux/build_package_linux.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -u -e
+set -e -u
 
 # Build the install package for Linux.
 # This script must be run from the root of the repository after running build_installer_linux.sh
diff --git a/release/macos/build_installer_macos.sh b/release/macos/build_installer_macos.sh
index 680f8661..e62a4781 100755
--- a/release/macos/build_installer_macos.sh
+++ b/release/macos/build_installer_macos.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
+set -e -u
 
 # Build the installer for MacOS.
 # This script must be run from the root of the repository.
 
-
 rm -rf dist
 rm -rf build
 
diff --git a/release/macos/build_package_macos.sh b/release/macos/build_package_macos.sh
index d7de4173..e4bc470d 100755
--- a/release/macos/build_package_macos.sh
+++ b/release/macos/build_package_macos.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-set -u -e
+set -e -u
 
 # Build the install package for MacOS.
 # This script must be run from the root of the repository after running build_installer_macos.sh
@@ -12,13 +12,15 @@ rm -rf ${BUILD_NAME}.pkg
 # cp ../../peptdeep/data/*.fasta dist/peptdeep/data
 
 # Wrapping the pyinstaller folder in a .pkg package
-mkdir -p dist/${PACKAGE_NAME}/Contents/Resources
-cp release/logos/alpha_logo.icns dist/${PACKAGE_NAME}/Contents/Resources
-mv dist/peptdeep_gui dist/${PACKAGE_NAME}/Contents/MacOS
-cp release/macos/Info.plist dist/${PACKAGE_NAME}/Contents
-cp release/macos/peptdeep_terminal dist/${PACKAGE_NAME}/Contents/MacOS
-cp LICENSE.txt dist/${PACKAGE_NAME}/Contents/Resources/LICENSE.txt
-cp release/logos/alpha_logo.png dist/${PACKAGE_NAME}/Contents/Resources/alpha_logo.png
+CONTENTS_FOLDER=dist/${PACKAGE_NAME}/Contents
+
+mkdir -p ${CONTENTS_FOLDER}/Resources
+cp release/logos/alpha_logo.icns ${CONTENTS_FOLDER}/Resources
+mv dist/peptdeep_gui ${CONTENTS_FOLDER}/MacOS
+cp release/macos/Info.plist ${CONTENTS_FOLDER}
+cp release/macos/peptdeep_terminal ${CONTENTS_FOLDER}/MacOS
+cp LICENSE.txt ${CONTENTS_FOLDER}/Resources/LICENSE.txt
+cp release/logos/alpha_logo.png ${CONTENTS_FOLDER}/Resources/alpha_logo.png
 chmod 777 release/macos/scripts/*
 
 pkgbuild --root dist/${PACKAGE_NAME} --identifier de.mpg.biochem.${PACKAGE_NAME}.app --version 1.2.1 --install-location /Applications/${PACKAGE_NAME}.app --scripts release/macos/scripts ${PACKAGE_NAME}.pkg
diff --git a/release/windows/build_installer_windows.ps1 b/release/windows/build_installer_windows.ps1
index 334296a9..570392e9 100644
--- a/release/windows/build_installer_windows.ps1
+++ b/release/windows/build_installer_windows.ps1
@@ -12,8 +12,3 @@ pip install "dist/peptdeep-1.2.1-py3-none-any.whl[stable]"
 # Creating the stand-alone pyinstaller folder
 pip install pyinstaller
 pyinstaller release/pyinstaller/peptdeep.spec -y
-
-# for some reason, the installer builder expects the files here
-mv dist/* release/windows/dist
-mkdir release/windows/dist/peptdeep
-mv release/windows/dist/peptdeep.exe release/windows/dist/peptdeep
diff --git a/release/windows/build_package_windows.ps1 b/release/windows/build_package_windows.ps1
index 056cd19b..4869dba9 100644
--- a/release/windows/build_package_windows.ps1
+++ b/release/windows/build_package_windows.ps1
@@ -1,5 +1,11 @@
 # Build the install package for Windows.
 # This script must be run from the root of the repository after running build_installer_windows.ps1
 
+
+# Apparently, ISCC uses the directory of the .iss input file as the working directory.
+mv dist/* release/windows/dist
+mkdir release/windows/dist/peptdeep
+mv release/windows/dist/peptdeep.exe release/windows/dist/peptdeep
+
 # Wrapping the pyinstaller folder in a .exe package
 &  "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" .\release\windows\peptdeep_innoinstaller.iss