Fix server linking