Minor fixes

Armin Felder requested to merge minorFixes into master

Merge request reports