Fixes for the mailer