Fixes to Ethnicity labels