Fix deprecations
0.4.0