Fixes for rustc update