#6494: Fixes in CSV file