More overrides for countries without correct fips codes