Fixed up some deprecations