minor cleanups

Marinus Schraal requested to merge wip/mschraal/minor-cleanups into master

Merge request reports