Finishing some of the bootstrap upgrades