some vs2013 fixes