port more to VC++ 2013