Fix mailer errors