Miscellaneous minor fixes

Split off from !507

Merge request reports

Loading