Fix warnings

Merged Martin Heistermann requested to merge fix-warnings into master

Merge request reports