added client fixes