Small api adjustments.