Latest Rust fixes