Updating with the winbuild changes