Minor bootstrap improvments