Fixes for latest nightly