Update for msvc13