Fixes for latest rust nightly