Update for breaking changes with latest rust