Select API fixes