Fixed reliance on rport for the actual server port