Fix so hostname and port are always together, to support host with no port, i.e. port 80 / 443