Fixup client port setup