r248: msvc changes