Bugfixes, especially import change