Update to work with latest Rust