Fixed phone number and primary key bugs