Small changes to setup.sh