Fix deprecations #10