Adapt to new versions of dependencies