tweak locators to work for both 5.1 and 5.2
Merge pull request #78 from dajohnso/locator_tweaks

tweak locators to work for both 5.1 and 5.2