Update code to compile with new Rust