Rust upgrade
Update for language changes