Fix broken chosen overrides