Fixups for Rust changes