Fixes on email