Fix remaining warnings.