Improve bootstrap.sh