Changes to build against nightly rustc