Unbreak MSVC build. fewer MSVC warnings