Try to fix more msvc warnings