Client tracking - add client fixes