Updated some deprecations