Fixes to build for latest nightly