Changes needed because of Rust changes.