Fixes for Contacts