Fixes to Ethnicity