Some bootstrapping changes