Resolve deprecations