Fix a number of warnings found in bootstrap.sh