Misc build_image updates