Rust upgrade: Fix strings