Various fixes and improvements

Here are various fixes and improvements. This is best reviewed commit-per-commit (see commit log for details).

I don't think there is anything controversial here so I made a joint MR.

Merge request reports

Loading