Misc bugfixes

See commits for details.

Merge request reports

Loading