Updated to build with latest rust-nightly