Fixes for the latest Rust master.
Merge pull request #22 from mrmonday/rust-master-fixes

Fixes for the latest Rust master.