New API fixes