Fixed some deprecations

Can't show this merge request because the source branch github/fork/jvanbaarsen/deprecation_fixes is missing from project import-export-testing-group/gitlabhq_1618880758. Close this merge request or update the source branch.