Updates for latest rustc