Fix warnings

[JurajX]

Hey there,

When compiling my project with -Wsign-conversion and -Wsuggest-override flags I get some annoying warnings (from both clang and gcc). I tried to fix them here, please have a look.

In case you see a better solution feel free to update. ;)