Fix some import bug