more vs2010 fixes