Correct compilation errors #7