Fix regressions in setup.sh

Merged Markus Scheidgen requested to merge v1-fix-setup into v1.0.2

Merge request reports