deprecations fixed