Tweaks for CSV