Fixes

Thorsten Wißmann requested to merge fixes into master

Merge request reports