Update for Rust changes