Fix up lingering email issues, some content changes