Solved some errors