minor tweaks to cross bootstrapping