Fix deprecations

Closes #3283008

Merge request reports