Hotfixes for Contacts