Additional API fixes