Fixes to three-tuple discovery