Fix partial import minor bugs