Fix some fallouts from recent changes.

See commits.

Merge request reports

Loading