Bugfixes for import data