Fix deprecations

Fixes #2

... at least enough for me.