Fixes on email sending