more MSVC warnings cleanups