Changes to the bootstrap script