Fix trees everywhere