fixed more locators.