Adapt to new versions upstream. Bump to v0.0.7