Adjust to deprecations