Fixes for recent Rust
Merge pull request #1 from bitshifter/master

Fixes for recent Rust