Adapt to broot changes