Fixing client/server discovery.