Fixes for Rust updates