Solved some compilation errors