Further cover VS 2010 / WinSDK 7.1 issues