Bug fixes to support tab delimeters