fixes locators as per new dicts and PEP8