Small fixes due to the restructuring

Merge request reports

Loading