fixes for latest rust nightly