Fix server url/port ambiguity