more bootstrap.sh fixes