Update some bootstrap issues