More bootstrapping tweaks