Update for latest rust changes