Fixes in CSV generation.