Small fixes to support bootstrap with Font Awesome 4.x