Fixing up some issues with my bootstrap overrides