Various fixes to Curve Editor so that it builds now