Solved some warnings