Fixed some remaining warnings