More support for MSVC11