fixed up remaining warnings