Fixed locators returned by versions