Fix the bootstrap