Fix remaining warnings