arm64 fixes