Fixes to support bootstrap 3