Minor fixes to CLI CSV-II