Some fixes for email validating