Fixes to the mailer - services