Fix some more MSVC warnings