more fixes to the bootstrap