Update to build with latest Rust