msvc 2013 fixes