Fixes in e-mail validator