Contacts Integration, bug fixes