Fix warnings for recent rust changes