Two bug fixes for the CSV results