Update for rustc changes