Commit other Win7 changes
Commit other Win7 changes