Solved compilation errors