Added few fixes for setup.sh