Update with mailchimp form fixes