Restored compatibility with Rust master
Updated dependencies