More bootstrap modifications