Fix tree locators

Fix tree locators