Fixing trees in these areas, many more fixes to do.