Fixup for arm64