Fixing CurveSegment inclusion
Fixing use of POWER_TYPE