Fixed some deprecations

Can't show this merge request because the source branch github/fork/jvanbaarsen/deprecation_fixes is missing from project gpt/large_projects/gitlabhq1_corrupted. Close this merge request or update the source branch.