Fix more MSVC warnings.