client model fixes