Address Rust Upgrade comments