Fixes related to Bootstrap 3 migration