Minor changes to setup.sh