Contact management fixes