Minor bootstrap optimization