fix tree and owners