Fix errors introduced from new rust nightly