Bug fixes to support Phone Number input