Some fixes for CSV import issues, but not finished