Fixes to suit bootstrap 3.0