CSV parsing improvements