More CSV changes