Fix import
More import fixes
Change build_part_image return