some import bugfixes