Minor bootstrap tweaks