Clean up some warnings

Let's see if this will quiet down the warnings on mingw