Fixes to Contacts