Various tweaks and clean up. Email service changes consumed.