fixed client issues