More build updates to resolve intermitten failures around configuring projects.