Fix build for nightly changes