Fix some email regex bugs