msvc warning cleanup