Fix/various small

Merged Timo Koch requested to merge fix/various-small into master

Merge request reports