fixes from client