some fixes in locator