Partial Rust upgrade for main crate