Re: image building fixes (rebased)