Circuit API fixes