Fix compilation errors #9