fixing deprecations