Fixing email issues