Fixing up some ownership problems