more updates to Windows build system