client - misc fix