bugfixes in import