Fix bootstrap.sh errors