Various fixes

See individual commits.

Merge request reports

Loading
Loading