Update to build with vs2012