try again on vs2012 build fixes