bugfixes in imports