Last few fixes for DUST mails