Fixing minor email issues