Resolve "Fix some errors"

Merged Carsten Riel requested to merge 1037-fix-some-errors into development
Edited by Dominik Hebeler

Merge request reports