Trivial fixes to CI and an error path

Merge request reports

Loading