Update with more VS2012/2010 changes.