Add better support when server and client run on different machines.