The rest of ppc64 fix