2 bug fixes in Curve