Some changes in find_object.