Fix servers with ports