Contacts fixes