updates for new Rust