Update for latest version of Rust