Fixed arm64 issues