more client fixes