s390x builder improvements