Compat fixes for nightly