Moar CSV fixes!

Nice.