Handle additional deprecations in 0.14.0-dev