More fixes for latest Rust changes.