Update Win32 options to use W3 not W2