More API fixes