Draft: Misc fixes

Merge request reports

Loading