More bootstrap updates