Update for newest Rust