[NF] Minor bootstrap fixes (#17).