Phone number and uppercasing fix