Minor bootstrap fixes