Small fixes to csv parsing.