Misc updates - mostly email related.