more msvc marning fixes