Fixes to setup.sh