Locator fixes