Adapt to next snapshot version