Fixes to client tracking for LISTCLIENTS