Cleaning up bootstrap issues