Moar CSV fixes!

I think this should be done in a separate PR/issue.