Fix client issues