Fix client references