Deprecations fixed