Various corrections and updates around mailing