Fix SG vs US phone country/area code clashes