Misc cleanups

See the commits for details.

Merge request reports

Loading