Modifications needed for MSVC 2012