Tweak upcoming deprecations