Updates for MSVC 11 compilation.