Updated for latest nightly (and updated deps)