Repaired remaining warnings