Fix TeradataSuite issues #585