fixes to contact, analytics