updates for latest rust