Fix with new Rust changes