Adapt to current changes in the base and discussions