Tweaks to CSV save