Fixes to Bootstrap