Minor fixes

Merged armin requested to merge minorFixes into master

Merge request reports