Some more minor bootstrap fixes