Fix remaining warnings from #1788