Various small fixups to handle changes in Rust