More bugfixing on CSV import