Cleanup/minor changes

Merged Thomas Fetzer requested to merge cleanup/minorChanges into master

Merge request reports