Update for current Rust