Fix nightly compilation errors