Fixes for rust nightly.