Improve compatibility of point and curve checks