Update for more rustc changes