[Locator] Fixes!