Fixes for rust-nightly