fix for compiler warnings

Since as of late we seem to have acquired some compiler warnings, I now tried to fix that. Didn't actually try compiling it locally, but hopefully it just fixes stuff.