[Client] Fix refs