Updates to work with latest deps
0.2.0