Initial API fixes