Fixes to work with latest Rust version.