Correct compilation errors #18