General fixes related to #6

Requires: !45 (merged)

Merge request reports

Loading