More fixes to error messages in CSV upload