Fixes for new Bootstrap