Fixes for Rust changes