Fix new warnings causing CI build failures on rustc beta