[import] [minor] fixes to aid migration