More changes for the bootstrap