more fixes for ppc64 and s390x