client fixes