Fix some more deprecations