Fix more warnings from #579