Solved some more warnings