Small fixes

Merged Markus Scheidgen requested to merge small-fixes into v0.10.1

Merge request reports