Updates for latest Rust