Fixups for various changes in Rust