Import fixes stable

bugfixes backport