More bootstrap fixes