Remove a few warnings

Oliver Sanderrequested to merge
fix-warnings into master

Just a few steps towards being able to enable -Werror.

Merge request reports