Object fixes to support owners.