Fix for rustc changes