post nodemailer upgrade fixes, various fixes