Update for latest Cargo and Rust