more changes to get the ownerships right