Improve locators