more arm64 changes