Fixup the VS20xx projects

Fixup the VS20xx projects