Update to work with current Rust version