Tweaks again to find clients