Adapt to upstream changes