Little bootstrap fixes