API objects, small fixes