Fixes for new rustc
Fix tests
Merge pull request #140 from canndrew/rustc-fixes

Rustc fixes