Small changes to mailing structure.