Fix phone number issues