Correct compilation errors