MailChimp integration small fixes