Update for latest rust