Fixes wrt email, 2 way dict fixed