Ownership Oddities fix