onnxruntime

b058dee6 - Fix a couple of issues mentioned in the PR comments. (#8936)