Fix deprecations

This makes removation of deprecated things in v4 easier.