More fixes for Bootstrap 2 -> 3 migration