More updates to Windows build process