More bootstrap changes