Fix a few issues with bootstrap-2.sh.