Adds proper ESTIMATE_CORNERS support