Fixing a little of Sorts and Ownership