Fix issues caused by upgrade to Bootstrap v3