more csv fixes