Bootstrap 3 migration bug fixes