Client: Revisions to handle server hostname/ipv4