Contacts bug fixes