fixing client bugs