Fix various phone number issues

Fixes #77