Re: s390x builder improvements