Various bugfixes related to importing.