Small fixes

Merged Markus Scheidgen requested to merge small-fixes into develop

Merge request reports