Tweaks to find_by in subs