Fixing warnings from latest rustc