Eliminate more warnings when using MSVC++