Updates for arm64