Fixing client issues