Updated a few locators and methods