Improve the bootstrap script