Make --client use the correct handles