Tweak some bootstrapping logic.