Update to changes in rust