fix arm64 issues