Fix echo'ing of server name and port