Use ClientUserManager's channel/user tracking
Fix build