Update to build with latest nightly