General fixes related to #7

Merge request reports

Loading