[import] fixes