Minor fixes for rust-nightly