fixing client issues