Fixes for VC++ 2013 Preview