Fix a few compiler warnings

Signed-off-by: Gergely Nagy <algernon@madhouse-project.org>
Merge pull request #234 from algernon/h/3.6/warning-fixes

Fix a few compiler warnings