Update for Latest Cargo and Rust