Fixes for the new version of bootstrap