some fixes in setup.sh