Fix some regex email bugs