r259: MSVC modifications