more API fixes