RLIB-11 fixes for csv mode