Improve phone number handling