Minor mailer changes