Update to work with latest rust changes