Fixing deprecations.