Tweaked locator defaults, improved legacy version matching.