Fixing some email mapping issues