Fixed some deprecations