Public API fixes