fixes for latest nightly