Update to work with latest nightly