Fix deprecations post upgrade