Mailer and spec fixes