arm64 crash fixes